aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-09-18 09:08:54 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-09-18 09:08:54 +0000
commitfa61ee70ee80b2b223fae86ee197987aa70499b2 (patch)
treea885364f8598acea0426ffbcc3b86ec0f02b6880 /src
parentf32fef1b075f63ecf8c7351c5e67d4dd95c0fb80 (diff)
* Fix `--from-profile'.
Diffstat (limited to 'src')
-rw-r--r--src/nix-env/nix-env.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index a7fc15904..67bdfb66f 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -1407,10 +1407,12 @@ void run(Strings args)
globals.instSource.systemFilter = needArg(i, args, arg);
else {
remaining.push_back(arg);
- if (arg[0] == '-')
+ if (arg[0] == '-') {
opFlags.push_back(arg);
- else
- opArgs.push_back(arg);
+ if (arg == "--from-profile") { /* !!! hack */
+ if (i != args.end()) opFlags.push_back(*i++);
+ }
+ } else opArgs.push_back(arg);
}
if (oldOp && oldOp != op)