lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

passAsFile: leave out the hash prefix

Browse source 
Having a colon in the path may cause issues, and having the hash
function indicated isn't actually necessary. We now verify the path 
format in the tests to prevent regressions.
This commit is contained in:
edef 2020-01-02 23:41:48 +00:00
parent 515c0a263e
commit c65a6fa86a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -2460,7 +2460,7 @@ void DerivationGoal::initTmpDir() {
env[i.first] = i.second; env[i.first] = i.second;
} else { } else {
auto hash = hashString(htSHA256, i.first); auto hash = hashString(htSHA256, i.first);
string fn = ".attr-" + hash.to_string(); string fn = ".attr-" + hash.to_string(Base32, false);
Path p = tmpDir + "/" + fn; Path p = tmpDir + "/" + fn;
writeFile(p, i.second); writeFile(p, i.second);
chownToBuilder(p); chownToBuilder(p);

1
tests/pass-as-file.sh
View file

@ -10,6 +10,7 @@ mkDerivation {
passAsFile = [ \"foo\" ]; passAsFile = [ \"foo\" ];
foo = [ \"xyzzy\" ]; foo = [ \"xyzzy\" ];
builder = builtins.toFile \"builder.sh\" '' builder = builtins.toFile \"builder.sh\" ''
[ \"\$(basename \$fooPath)\" = .attr-1bp7cri8hplaz6hbz0v4f0nl44rl84q1sg25kgwqzipzd1mv89ic ]
[ \"\$(cat \$fooPath)\" = xyzzy ] [ \"\$(cat \$fooPath)\" = xyzzy ]
touch \$out touch \$out
''; '';