Hello there! I just noticed that my patch has a bug (I am sorry about that but I haven't done anything with perl for quite a while). Anyway, the fix is as follows:
=== modified file 'pristine-tar'
--- pristine-tar 2009-09-07 08:47:55 +0000
+++ pristine-tar 2009-09-07 10:39:49 +0000
@@ -402,7 +402,7 @@
my @files_in_tree = ();
# The local function will strip off the './' prefix of all paths.
- find sub { ($_ = $File::Find::name) =~ s![^/]+/!!;
push(@files_in_tree, $_) }, qw(.);
+ find sub { ($_ = $File::Find::name) =~ s![^/]+/!!; s/^\s*//;
s/\s*$//; push(@files_in_tree, $_) if $_ ne "" }, qw(.);
open(IN, "<", $manifest) || die "$!";
while (<IN>) {
@@ -413,7 +413,9 @@
# Strip off trailing slashes (if any) so we can compare these paths
# with the ones found in the local source tree.
s,/*$,,;
- push(@manifest_entries, $_);
+ # Strip leading/trailing whitespace.
+ s/^\s*//; s/\s*$//;
+ push(@manifest_entries, $_) if $_ ne "";
}
close IN;
@@ -424,7 +426,7 @@
delete @seen {...@files_in_tree};
my @missing_in_tree = sort(keys %seen);
- debug("$#missing_in_tree files missing in source tree:
@missing_in_tree");
+ debug("Files missing in source tree: ", join(", ", @missing_in_tree));
return @missing_in_tree;
}
@@ -442,9 +444,8 @@
# If not, we'll be generating a "broken" delta since not all the paths
# required for generating a pristine tar later are actually available.
my @missing_in_tree = checkmanifest("$tempdir/manifest");
- debug("$#missing_in_tree files missing in source tree:
@missing_in_tree");
- if ($#missing_in_tree > 0) {
+ if ($#missing_in_tree >= 0) {
# Abort here since we don't have all the files required for
generating
# a pristine tar in the source tree.
error("Files missing in source tree: @missing_in_tree");
Best regards
--
Muharem Hrnjadovic <muha...@canonical.com>
Public key id : B2BBFCFC
Key fingerprint : A5A3 CC67 2B87 D641 103F 5602 219F 6B60 B2BB FCFC
signature.asc
Description: OpenPGP digital signature
