From c702dfca3f5a437866faf190ce7b0869fd1058cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri, 8 Apr 2005 13:48:41 +0000
Subject: * nix-store: `--substitute' -> `--register-substitutes'.

---
 src/nix-store/help.txt | 2 +-
 src/nix-store/main.cc  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/nix-store/help.txt b/src/nix-store/help.txt
index 30f94a051852..643c6bff581f 100644
--- a/src/nix-store/help.txt
+++ b/src/nix-store/help.txt
@@ -9,7 +9,7 @@ Operations:
   --add / -A: copy a path to the Nix store
   --query / -q: query information
 
-  --substitute: register a substitute expression (dangerous!)
+  --register-substitutes: register a substitute expression (dangerous!)
   --clear-substitutes: clear all substitutes
   --register-validity: register path validity (dangerous!)
   --check-validity: check path validity
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 496924677588..87fbe58b1ba3 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -394,7 +394,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
 }
 
 
-static void opSubstitute(Strings opFlags, Strings opArgs)
+static void opRegisterSubstitutes(Strings opFlags, Strings opArgs)
 {
     if (!opFlags.empty()) throw UsageError("unknown flag");
     if (!opArgs.empty()) throw UsageError("no arguments expected");
@@ -607,8 +607,8 @@ void run(Strings args)
             op = opPrintFixedPath;
         else if (arg == "--query" || arg == "-q")
             op = opQuery;
-        else if (arg == "--substitute")
-            op = opSubstitute;
+        else if (arg == "--register-substitutes")
+            op = opRegisterSubstitutes;
         else if (arg == "--clear-substitutes")
             op = opClearSubstitutes;
         else if (arg == "--register-validity")
-- 
cgit 1.4.1