* If a patch already exists, it must still be included in the manifest.
This commit is contained in:
parent
35b76a81c4
commit
c53898cb65
|
@ -215,18 +215,21 @@ foreach my $p (keys %dstOutPaths) {
|
||||||
my $finalName =
|
my $finalName =
|
||||||
"$narDiffHash-$name-$closestVersion-to-$version.nar-bsdiff";
|
"$narDiffHash-$name-$closestVersion-to-$version.nar-bsdiff";
|
||||||
|
|
||||||
if (-e "$patchesDir/$finalName") {
|
|
||||||
print " not copying, already exists\n";
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
|
|
||||||
print " size $narDiffSize; full size $dstNarBz2Size\n";
|
print " size $narDiffSize; full size $dstNarBz2Size\n";
|
||||||
|
|
||||||
system("cp '$tmpdir/DIFF' '$patchesDir/$finalName.tmp'") == 0
|
if (-e "$patchesDir/$finalName") {
|
||||||
or die "cannot copy diff";
|
print " not copying, already exists\n";
|
||||||
|
}
|
||||||
|
|
||||||
rename("$patchesDir/$finalName.tmp", "$patchesDir/$finalName")
|
else {
|
||||||
or die "cannot rename $patchesDir/$finalName.tmp";
|
|
||||||
|
system("cp '$tmpdir/DIFF' '$patchesDir/$finalName.tmp'") == 0
|
||||||
|
or die "cannot copy diff";
|
||||||
|
|
||||||
|
rename("$patchesDir/$finalName.tmp", "$patchesDir/$finalName")
|
||||||
|
or die "cannot rename $patchesDir/$finalName.tmp";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
# Add the patch to the manifest.
|
# Add the patch to the manifest.
|
||||||
addPatch \%dstPatches, $p,
|
addPatch \%dstPatches, $p,
|
||||||
|
|
Loading…
Reference in a new issue