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

* Option `--reregister' in `nix-store --register-validity'. We need 

this in the NixOS installer (or in the buildfarm) to ensure that the
  cryptographic hash of the path contents still matches the actual
  contents.
This commit is contained in:
Eelco Dolstra 2006-11-13 16:48:27 +00:00
parent e790404318
commit e40d4a5604
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manual/release-notes.xml
View File

@ -28,6 +28,10 @@
<listitem><para>TODO: now using Berkeley DB 4.5.</para></listitem>
<listitem><para>Option <option>--reregister</option> in
<command>nix-store --register-validity</command>.</para></listitem>
</itemizedlist>

26
src/nix-store/main.cc
View File

@ -138,6 +138,14 @@ static void opAddFixed(Strings opFlags, Strings opArgs)
}
static Hash parseHash16or32(HashType ht, const string & s)
{
return s.size() == Hash(ht).hashSize * 2
? parseHash(ht, s)
: parseHash32(ht, s);
}
/* Hack to support caching in `nix-prefetch-url'. */
static void opPrintFixedPath(Strings opFlags, Strings opArgs)
{
@ -153,13 +161,9 @@ static void opPrintFixedPath(Strings opFlags, Strings opArgs)
string hash = *i++;
string name = *i++;
HashType ht(parseHashType(hashAlgo));
Hash h = hash.size() == Hash(ht).hashSize * 2
? parseHash(ht, hash)
: parseHash32(ht, hash);
cout << format("%1%\n") %
makeFixedOutputPath(recursive, hashAlgo, h, name);
makeFixedOutputPath(recursive, hashAlgo,
parseHash16or32(parseHashType(hashAlgo), hash), name);
}
@ -487,7 +491,13 @@ static void opClearSubstitutes(Strings opFlags, Strings opArgs)
static void opRegisterValidity(Strings opFlags, Strings opArgs)
{
if (!opFlags.empty()) throw UsageError("unknown flag");
bool reregister = false; // !!! maybe this should be the default
for (Strings::iterator i = opFlags.begin();
i != opFlags.end(); ++i)
if (*i == "--reregister") reregister = true;
else throw UsageError(format("unknown flag `%1%'") % *i);
if (!opArgs.empty()) throw UsageError("no arguments expected");
ValidPathInfos infos;
@ -505,7 +515,7 @@ static void opRegisterValidity(Strings opFlags, Strings opArgs)
info.references.insert(s);
}
if (!cin || cin.eof()) throw Error("missing input");
if (!isValidPath(info.path)) {
if (!isValidPath(info.path) || reregister) {
/* !!! races */
canonicalisePathMetaData(info.path);
info.hash = hashPath(htSHA256, info.path);