139/376: Fix --attr parsing

[Ludovic Courtès]

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