The following commit has been merged in the master branch:
commit 74b5b92eaed9566565f522bd896187ed2920310c
Author: Raphael Hertzog <[email protected]>
Date: Sat Jul 25 00:48:14 2009 +0200
Fix apply_patches() funtion of 3.0 (quilt) format to properly skip auto
patch
When quilt was used, it was applying the automatic patch even
when $skip_auto was set to 1. This bug was introduced while fixing
bug #518453 (commit ea1530fe45c8b1ad61d91c0791c53ecf363899bf).
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index 7c7e62d..a243015 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -166,8 +166,8 @@ sub apply_patches {
if (not $self->{'options'}{'without_quilt'}) {
my %opts;
$opts{"to_file"} = "/dev/null" if $skip_auto;
- info(_g("applying all patches with %s"), "quilt push -a -q") unless
$skip_auto;
- $self->run_quilt($dir, ['push', '-a', '-q'],
+ info(_g("applying all patches with %s"), "quilt push -q " .
$patches[-1]) unless $skip_auto;
+ $self->run_quilt($dir, ['push', '-q', $patches[-1]],
delete_env => ['QUILT_PATCH_OPTS'],
wait_child => 1, %opts);
foreach my $patch (@patches) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
