From 532d766c279daf190728b4815b92f04623e7fb7f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Jul 2010 11:30:23 +0000 Subject: [PATCH] * Don't barf if the source NAR for a patch has disappeared. --- scripts/generate-patches.pl.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/generate-patches.pl.in b/scripts/generate-patches.pl.in index d538df12e..dba647350 100755 --- a/scripts/generate-patches.pl.in +++ b/scripts/generate-patches.pl.in @@ -64,7 +64,7 @@ sub findOutputPaths { next if ($p =~ /\.patch$/); # Don't bother including tar files etc. - next if ($p =~ /\.tar\.(gz|bz2)$/ || $p =~ /\.zip$/ || $p =~ /\.bin$/); + next if ($p =~ /\.tar$/ || $p =~ /\.tar\.(gz|bz2|Z|lzma|xz)$/ || $p =~ /\.zip$/ || $p =~ /\.bin$/ || $p =~ /\.tgz$/ || $p =~ /\.rpm$/ || $p =~ /cvs-export$/ || $p =~ /fetchhg$/); $outPaths{$p} = 1; } @@ -291,6 +291,11 @@ foreach my $p (keys %dstOutPaths) { my $srcNarBz2 = getNarBz2 \%srcNarFiles, $closest; my $dstNarBz2 = getNarBz2 \%dstNarFiles, $p; + if (! -f $srcNarBz2) { + warn "patch source archive $srcNarBz2 is missing\n"; + next; + } + system("@bunzip2@ < $srcNarBz2 > $tmpDir/A") == 0 or die "cannot unpack $srcNarBz2";