picnoir/fix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

passAsFile: hash the attribute name instead of numbering sequentially

Browse source 
This makes the paths consistent without relying on ordering.

Co-authored-by: edef <edef@edef.eu>
This commit is contained in:
Puck Meerburg 2020-01-02 17:20:57 +00:00 committed by edef
parent 3469062e76
commit 515c0a263e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -2455,12 +2455,12 @@ void DerivationGoal::initTmpDir() {
if (!parsedDrv->getStructuredAttrs()) {
StringSet passAsFile = tokenizeString<StringSet>(get(drv->env, "passAsFile").value_or(""));
int fileNr = 0;
for (auto & i : drv->env) {
if (passAsFile.find(i.first) == passAsFile.end()) {
env[i.first] = i.second;
} else {
string fn = ".attr-" + std::to_string(fileNr++);
auto hash = hashString(htSHA256, i.first);
string fn = ".attr-" + hash.to_string();
Path p = tmpDir + "/" + fn;
writeFile(p, i.second);
chownToBuilder(p);