about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-04-09T12·37+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-04-09T12·37+0000
commitb762f4df7f6b8d0a4b306fc7e1c2633c4802d1c2 (patch)
treec0f3905f5d670c890dcbf15f32784edb2dab2757
parentaa8fda4b54fbd84b7bc6b11904c156367683e8f6 (diff)
* In `fix --instantiate', only print out the hashes of the Nix
  descriptors generated out of Fix descriptors specified on the
  command line.  This allows us to say:

    nix-switch $(fix -i ./test/fixdescriptors/system.fix)


-rw-r--r--src/fix.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/fix.cc b/src/fix.cc
index 8d5cc6bf8e0b..0d3ae9bff868 100644
--- a/src/fix.cc
+++ b/src/fix.cc
@@ -226,8 +226,6 @@ string instantiateDescriptor(string filename,
     if (rename(tmpFilename.c_str(), outFilename.c_str()))
         throw Error("cannot rename " + tmpFilename + " to " + outFilename);
 
-    cout << outFilename << endl;
-
     /* Register it with Nix. */
     registerFile(outFilename);
 
@@ -245,7 +243,7 @@ void instantiateDescriptors(Strings filenames)
          it != filenames.end(); it++)
     {
         string filename = absPath(*it);
-        instantiateDescriptor(filename, done);
+        cout << instantiateDescriptor(filename, done) << endl;
     }
 }