TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a bug that caused Fix not to be deterministic (due to addToStore 

returning different paths if the hash of the path to be added was
  already available in the store under a different name).
This commit is contained in:
Eelco Dolstra 2003-07-11 08:41:03 +00:00
parent c834a5c597
commit 73b163c1a1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fix.cc
View File

@ -131,7 +131,7 @@ static Expr evalExpr(Expr e)
string srcPath = searchPath(s1);
string dstPath;
Hash hash;
addToStore(srcPath, dstPath, hash);
addToStore(srcPath, dstPath, hash, true);
return ATmake("Path(<str>, Hash(<str>), [])",
dstPath.c_str(), ((string) hash).c_str());
}

13
src/store.cc
View File

@ -224,24 +224,23 @@ string expandHash(const Hash & hash, const string & target,
}
void addToStore(string srcPath, string & dstPath, Hash & hash)
void addToStore(string srcPath, string & dstPath, Hash & hash,
bool deterministicName)
{
srcPath = absPath(srcPath);
hash = hashPath(srcPath);
string baseName = baseNameOf(srcPath);
dstPath = canonPath(nixStore + "/" + (string) hash + "-" + baseName);
try {
/* !!! should not use the substitutes! */
dstPath = expandHash(hash, "", nixStore);
dstPath = expandHash(hash, deterministicName ? dstPath : "", nixStore);
return;
} catch (...) {
}
string baseName = baseNameOf(srcPath);
dstPath = canonPath(nixStore + "/" + (string) hash + "-" + baseName);
copyPath(srcPath, dstPath);
registerPath(dstPath, hash);
}

3
src/store.hh
View File

@ -30,7 +30,8 @@ string expandHash(const Hash & hash, const string & target = "",
/* Copy a file to the nixStore directory and register it in dbRefs.
Return the hash code of the value. */
void addToStore(string srcPath, string & dstPath, Hash & hash);
void addToStore(string srcPath, string & dstPath, Hash & hash,
bool deterministicName = false);
/* Delete a value from the nixStore directory. */
void deleteFromStore(const string & path);