about summary refs log tree commit diff
path: root/src/nix-store
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-02-07T21·17-0500
committerShea Levy <shea@shealevy.com>2014-02-08T05·13-0500
commit73874629ef59dc3b237a2c316179e722f971bb5e (patch)
treeb8280e43b84d54a227ef3e995b13c3a6f1269d1b /src/nix-store
parent188f96500bc16891b22c684ad96122635667a8ff (diff)
nix-store --serve: Use dump instead of export
Also remove signing support

Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/nix-store.cc12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index fb1d3f541dec..e3f27820fffd 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -837,18 +837,12 @@ static void opClearFailedPaths(Strings opFlags, Strings opArgs)
 // Serve the nix store in a way usable by a restricted ssh user
 static void opServe(Strings opFlags, Strings opArgs)
 {
-    if (!opArgs.empty())
-        throw UsageError("no arguments expected");
-    // Could eventually take a username argument?
-    bool sign;
-    foreach (Strings::iterator, i, opFlags)
-        if (*i == "--sign") sign = true;
-        else throw UsageError(format("unknown flag `%1%'") % *i);
-
+    if (!opArgs.empty() || !opFlags.empty())
+        throw UsageError("no arguments or flags expected");
     FdSource in(STDIN_FILENO);
     FdSink out(STDOUT_FILENO);
 
-    store->serve(in, out, sign);
+    store->serve(in, out);
 }