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

* Prefix hash algorithm in patch generator too.

Browse source
This commit is contained in:
Eelco Dolstra 2005-03-14 16:46:19 +00:00
parent 8eff18cd43
commit bd333b939c
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/generate-patches.pl.in
View file

@ -6,6 +6,8 @@ use readmanifest;
die unless scalar @ARGV == 5; die unless scalar @ARGV == 5;
my $hashAlgo = "sha1";
my $cacheDir = $ARGV[0]; my $cacheDir = $ARGV[0];
my $patchesDir = $ARGV[1]; my $patchesDir = $ARGV[1];
my $patchesURL = $ARGV[2]; my $patchesURL = $ARGV[2];
@ -285,13 +287,13 @@ foreach my $p (keys %dstOutPaths) {
system("@libexecdir@/bsdiff $tmpdir/A $tmpdir/B $tmpdir/DIFF") == 0 system("@libexecdir@/bsdiff $tmpdir/A $tmpdir/B $tmpdir/DIFF") == 0
or die "cannot compute binary diff"; or die "cannot compute binary diff";
my $baseHash = `@bindir@/nix-hash --flat --type sha1 $tmpdir/A` or die; my $baseHash = `@bindir@/nix-hash --flat --type $hashAlgo --base32 $tmpdir/A` or die;
chomp $baseHash; chomp $baseHash;
my $narHash = `@bindir@/nix-hash --flat --type sha1 $tmpdir/B` or die; my $narHash = `@bindir@/nix-hash --flat --type $hashAlgo --base32 $tmpdir/B` or die;
chomp $narHash; chomp $narHash;
my $narDiffHash = `@bindir@/nix-hash --flat --type sha1 $tmpdir/DIFF` or die; my $narDiffHash = `@bindir@/nix-hash --flat --type $hashAlgo --base32 $tmpdir/DIFF` or die;
chomp $narDiffHash; chomp $narDiffHash;
my $narDiffSize = (stat "$tmpdir/DIFF")[7]; my $narDiffSize = (stat "$tmpdir/DIFF")[7];
@ -303,7 +305,7 @@ foreach my $p (keys %dstOutPaths) {
} }
my $finalName = my $finalName =
"$narDiffHash-$name-$closestVersion-to-$version.nar-bsdiff"; "$narDiffHash.nar-bsdiff";
print " size $narDiffSize; full size $dstNarBz2Size\n"; print " size $narDiffSize; full size $dstNarBz2Size\n";
@ -323,10 +325,9 @@ 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 => $narDiffHash { url => "$patchesURL/$finalName", hash => "$hashAlgo:$narDiffHash"
, size => $narDiffSize, hashAlgo => "sha1" , size => $narDiffSize, basePath => $closest, baseHash => "$hashAlgo:$baseHash"
, basePath => $closest, baseHash => $baseHash , narHash => "$hashAlgo:$narHash", patchType => "nar-bsdiff"
, narHash => $narHash, patchType => "nar-bsdiff"
}; };
} }
} }