diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-12-13 21:04:48 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-12-13 21:04:48 +0000 |
commit | ab5c6bb3a3deef29c6fe0a86017d35bc4f3de506 (patch) | |
tree | b20966a04ab787ba4787c4f98800fcadbf1b1781 /src/nix-store | |
parent | d87549c1c7bb6f85ff0a019b33b315ace0013e6b (diff) |
* Change `referer' to `referrer' throughout. In particular, the
nix-store query options `--referer' and `--referer-closure' have
been changed to `--referrer' and `--referrer-closure' (but the old
ones are still accepted for compatibility).
Diffstat (limited to 'src/nix-store')
-rw-r--r-- | src/nix-store/help.txt | 4 | ||||
-rw-r--r-- | src/nix-store/main.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/nix-store/help.txt b/src/nix-store/help.txt index 643c6bff5..628805835 100644 --- a/src/nix-store/help.txt +++ b/src/nix-store/help.txt @@ -28,8 +28,8 @@ Query flags: --outputs: query the output paths of a Nix derivation (default) --requisites / -R: print all paths necessary to realise a path --references: print all paths referenced by the given path - --referers: print all paths directly refering to the given path - --referers-closure: print all paths (in)directly refering to the given path + --referrers: print all paths directly refering to the given path + --referrers-closure: print all paths (in)directly refering to the given path --tree: print a tree showing the dependency graph of the given paths --graph: print a dot graph rooted at given paths diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc index a6ff117cb..d1a96aa3a 100644 --- a/src/nix-store/main.cc +++ b/src/nix-store/main.cc @@ -273,8 +273,8 @@ static void printTree(const Path & path, /* Perform various sorts of queries. */ static void opQuery(Strings opFlags, Strings opArgs) { - enum { qOutputs, qRequisites, qReferences, qReferers - , qReferersClosure, qDeriver, qBinding, qHash + enum { qOutputs, qRequisites, qReferences, qReferrers + , qReferrersClosure, qDeriver, qBinding, qHash , qTree, qGraph } query = qOutputs; bool useOutput = false; bool includeOutputs = false; @@ -286,8 +286,8 @@ static void opQuery(Strings opFlags, Strings opArgs) if (*i == "--outputs") query = qOutputs; else if (*i == "--requisites" || *i == "-R") query = qRequisites; else if (*i == "--references") query = qReferences; - else if (*i == "--referers") query = qReferers; - else if (*i == "--referers-closure") query = qReferersClosure; + else if (*i == "--referrers" || *i == "--referers") query = qReferrers; + else if (*i == "--referrers-closure" || *i == "--referers-closure") query = qReferrersClosure; else if (*i == "--deriver" || *i == "-d") query = qDeriver; else if (*i == "--binding" || *i == "-b") { if (opArgs.size() == 0) @@ -320,8 +320,8 @@ static void opQuery(Strings opFlags, Strings opArgs) case qRequisites: case qReferences: - case qReferers: - case qReferersClosure: { + case qReferrers: + case qReferrersClosure: { PathSet paths; for (Strings::iterator i = opArgs.begin(); i != opArgs.end(); ++i) @@ -330,8 +330,8 @@ static void opQuery(Strings opFlags, Strings opArgs) if (query == qRequisites) storePathRequisites(path, includeOutputs, paths); else if (query == qReferences) queryReferences(noTxn, path, paths); - else if (query == qReferers) queryReferers(noTxn, path, paths); - else if (query == qReferersClosure) computeFSClosure(path, paths, true); + else if (query == qReferrers) queryReferrers(noTxn, path, paths); + else if (query == qReferrersClosure) computeFSClosure(path, paths, true); } printPathSet(paths); break; |