[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
139/376: Fix --attr parsing
From: |
Ludovic Courtès |
Subject: |
139/376: Fix --attr parsing |
Date: |
Wed, 28 Jan 2015 22:04:35 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 02843ba4cb041992535c28b266796f75646544b5
Author: Eelco Dolstra <address@hidden>
Date: Mon Aug 18 15:48:23 2014 +0200
Fix --attr parsing
---
src/nix-env/nix-env.cc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index e65dc4e..44296c7 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -1402,7 +1402,9 @@ int main(int argc, char * * argv)
repair = true;
else if (*arg != "" && arg->at(0) == '-') {
opFlags.push_back(*arg);
- if (*arg == "--from-profile" || *arg == "--atr" || *arg ==
"-A") /* !!! hack */
+ /* FIXME: hacky */
+ if (*arg == "--from-profile" ||
+ (op == opQuery && (*arg == "--attr" || *arg == "-A")))
opFlags.push_back(getArg(*arg, arg, end));
}
else
- 128/376: nix-log2xml: Handle UTF-8 characters, (continued)
- 128/376: nix-log2xml: Handle UTF-8 characters, Ludovic Courtès, 2015/01/28
- 132/376: nix-shell: Use $XDG_RUNTIME_DIR, Ludovic Courtès, 2015/01/28
- 120/376: download-from-binary-cache.pl: Respect $SSL_CERT_FILE, Ludovic Courtès, 2015/01/28
- 123/376: Remove pointless NIX_LOG_TYPE environment variable, Ludovic Courtès, 2015/01/28
- 136/376: Propagate remote timeouts properly, Ludovic Courtès, 2015/01/28
- 131/376: Use $XDG_RUNTIME_DIR for temporary files, Ludovic Courtès, 2015/01/28
- 137/376: Reduce verbosity, Ludovic Courtès, 2015/01/28
- 133/376: Fix download-via-ssh, Ludovic Courtès, 2015/01/28
- 130/376: nix-log2xml: Handle newlines, Ludovic Courtès, 2015/01/28
- 143/376: nix-store -l: Automatically pipe output into $PAGER, Ludovic Courtès, 2015/01/28
- 139/376: Fix --attr parsing,
Ludovic Courtès <=
- 142/376: Reduce test verbosity, Ludovic Courtès, 2015/01/28
- 138/376: Doh, Ludovic Courtès, 2015/01/28
- 135/376: nix-build: Propagate exit status from nix-store -r, Ludovic Courtès, 2015/01/28
- 125/376: Refactor option handling, Ludovic Courtès, 2015/01/28
- 134/376: build-remote.pl: Provide defaults for $NIX_CURRENT_LOAD and $NIX_REMOTE_SYSTEMS, Ludovic Courtès, 2015/01/28
- 141/376: Filter Nix-specific ANSI escape sequences from stderr, Ludovic Courtès, 2015/01/28
- 140/376: Make hook shutdown more reliable, Ludovic Courtès, 2015/01/28
- 144/376: Add some color, Ludovic Courtès, 2015/01/28
- 147/376: Handle header file instantiation, Ludovic Courtès, 2015/01/28
- 152/376: Flush std::cout before closing stdout, Ludovic Courtès, 2015/01/28