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

Be more robust wrt broken .narinfo files

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-03 15:19:32 +02:00
parent f0f30f594c
commit a64da5915d
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
perl/lib/Nix/Manifest.pm
View file

@ -462,9 +462,16 @@ sub parseNARInfo {
return undef; return undef;
} }
my $fingerprint = fingerprintPath( my $fingerprint;
$storePath, $narHash, $narSize, eval {
[ map { "$Nix::Config::storeDir/$_" } @refs ]); $fingerprint = fingerprintPath(
$storePath, $narHash, $narSize,
[ map { "$Nix::Config::storeDir/$_" } @refs ]);
};
if ($@) {
warn "cannot compute fingerprint of ‘$location’; ignoring\n";
return undef;
}
if (!checkSignature($publicKey, decode_base64($sig64), $fingerprint)) { if (!checkSignature($publicKey, decode_base64($sig64), $fingerprint)) {
warn "NAR info file ‘$location’ has an incorrect signature; ignoring\n"; warn "NAR info file ‘$location’ has an incorrect signature; ignoring\n";