The following commit has been merged in the master branch:
commit d97161c298625c8475b0b3d2d9e89e60ae56a5ff
Author: Guillem Jover <guil...@debian.org>
Date: Tue Aug 23 03:55:27 2011 +0200
Dpkg::Source::Package: Use “-z” instead of “not -s”
diff --git a/scripts/Dpkg/Source/Package/V2.pm
b/scripts/Dpkg/Source/Package/V2.pm
index 4912dfd..12d448a 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -501,7 +501,7 @@ sub do_build {
my $tmpdiff = $self->generate_patch($dir, order_from => $autopatch,
handle_binary => $handle_binary,
usage => 'build');
- unless (not -s $tmpdiff or $self->{'options'}{'single_debian_patch'}
+ unless (-z $tmpdiff or $self->{'options'}{'single_debian_patch'}
or $self->{'options'}{'auto_commit'}) {
info(_g("you can integrate the local changes with %s"),
"dpkg-source --commit");
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index 4db776b..2fbcba2 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -389,7 +389,7 @@ sub register_patch {
erasedir(File::Spec->catdir($dir, ".pc", $patch_name));
}
# Clean up empty series
- unlink($series) if not -s $series;
+ unlink($series) if -z $series;
}
return $patch;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
