diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nix.cc | 10 | ||||
| -rw-r--r-- | src/store.cc | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/nix.cc b/src/nix.cc index dc9d04148d14..0cdce2adc5ec 100644 --- a/src/nix.cc +++ b/src/nix.cc @@ -21,7 +21,7 @@ static ArgType argType = atpUnknown; Operations: - --realise / -r: realise values + --install / -i: install (or `realise') values --delete / -d: delete values --query / -q: query stored values --add: add values @@ -86,8 +86,8 @@ static void getArgType(Strings & flags) } -/* Realise values. */ -static void opRealise(Strings opFlags, Strings opArgs) +/* Install values. */ +static void opInstall(Strings opFlags, Strings opArgs) { getArgType(opFlags); if (!opFlags.empty()) throw UsageError("unknown flag"); @@ -238,8 +238,8 @@ void run(Strings args) Operation oldOp = op; - if (arg == "--realise" || arg == "-r") - op = opRealise; + if (arg == "--install" || arg == "-i") + op = opInstall; else if (arg == "--delete" || arg == "-d") op = opDelete; else if (arg == "--add") diff --git a/src/store.cc b/src/store.cc index 73713201d7e2..977cd2594f0b 100644 --- a/src/store.cc +++ b/src/store.cc @@ -125,11 +125,8 @@ static string queryPathByHashPrefix(Hash hash, const string & prefix) for (Strings::iterator it = paths.begin(); it != paths.end(); it++) { - debug(*it); string path = *it; try { - debug(path); - debug(prefix); if (isInPrefix(path, prefix) && hashPath(path) == hash) return path; } catch (Error & e) { |