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

* Reject patches larger than the full archives they produce.

Browse source
This commit is contained in:
Eelco Dolstra 2004-12-29 19:32:55 +00:00
parent 2fdb27e7f2
commit 54d8f08588
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/generate-patches.pl
View file

@ -191,13 +191,19 @@ foreach my $p (keys %dstOutPaths) {
my $narHash = `nix-hash --flat $tmpdir/B` or die; my $narHash = `nix-hash --flat $tmpdir/B` or die;
chomp $narHash; chomp $narHash;
my $narBz2Hash = `nix-hash --flat $tmpdir/DIFF` or die; my $narDiffHash = `nix-hash --flat $tmpdir/DIFF` or die;
chomp $narBz2Hash; chomp $narDiffHash;
my $narBz2Size = (stat "$tmpdir/DIFF")[7]; my $narDiffSize = (stat "$tmpdir/DIFF")[7];
my $dstNarBz2Size = (stat $dstNarBz2)[7];
if ($narDiffSize >= $dstNarBz2Size) {
print " rejecting; patch bigger than full archive\n";
next;
}
my $finalName = my $finalName =
"$narBz2Hash-$name-$closestVersion-to-$version.nar-diff"; "$narDiffHash-$name-$closestVersion-to-$version.nar-diff";
if (-e "$patchesDir/$finalName") { if (-e "$patchesDir/$finalName") {
print " not copying, already exists\n"; print " not copying, already exists\n";
@ -212,8 +218,8 @@ foreach my $p (keys %dstOutPaths) {
# Add the patch to the manifest. # Add the patch to the manifest.
addPatch \%dstPatches, $p, addPatch \%dstPatches, $p,
{ url => "$patchesURL/$finalName", hash => $narBz2Hash { url => "$patchesURL/$finalName", hash => $narDiffHash
, size => $narBz2Size , size => $narDiffSize
, basePath => $closest, baseHash => $baseHash , basePath => $closest, baseHash => $baseHash
, narHash => $narHash, patchType => "nar-bsdiff" , narHash => $narHash, patchType => "nar-bsdiff"
}; };