about summary refs log tree commit diff
path: root/src/values.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-06-17T21·12+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-06-17T21·12+0000
commit34fcf5fa0c0cc02edc6820b99d98e7ae278c6c00 (patch)
treecf468ffe5a0b4234c7d1fb91125ea0f53e8c9f02 /src/values.cc
parent7a96da3627220d11a985662446e8a75fb8cc2d40 (diff)
* Started integrating the new evaluation model into Nix.
* Cleaned up command-line syntax.

Diffstat (limited to 'src/values.cc')
-rw-r--r--src/values.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/values.cc b/src/values.cc
index 77a6f928e1a2..7cef5d3def2b 100644
--- a/src/values.cc
+++ b/src/values.cc
@@ -19,6 +19,8 @@ static string absValuePath(string s)
 
 Hash addValue(string path)
 {
+    path = absPath(path);
+
     Hash hash = hashPath(path);
 
     string name;
@@ -79,7 +81,7 @@ string queryValuePath(Hash hash)
             return fn;
         }
 
-        throw Error("a file with hash " + (string) hash + " is requested, "
+        throw Error("a file with hash " + (string) hash + " is required, "
             "but it is not known to exist locally or on the network");
 #if 0
         if (checkedNet)
@@ -87,7 +89,7 @@ string queryValuePath(Hash hash)
                 " should have hash " + (string) hash + ", but it doesn't");
 
         if (!queryDB(nixDB, dbNetSources, hash, url))
-            throw Error("a file with hash " + (string) hash + " is requested, "
+            throw Error("a file with hash " + (string) hash + " is required, "
                 "but it is not known to exist locally or on the network");
 
         checkedNet = true;