The following commit has been merged in the lenny branch:
commit 281b54dda7075469f316b7764e582cb830a865c1
Author: Raphaël Hertzog <[email protected]>
Date: Tue Nov 24 00:51:59 2009 +0100
Dpkg::Source::Package::V3::quilt: set QUILT_PATCH_OPTS to mimick D::S::Patch
When building "3.0 (quilt)" source packages, use QUILT_PATCH_OPTS="-t -F 0
-N -u -V never -g0" so that quilt is as strict as dpkg-source's internal
implementation of quilt that relies on Dpkg::Source::Patch::apply().
This commit is cherry-picked only so that further commits replacing
entirely the patching code can be cherry-picked without big conflicts.
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index 5b45f6c..2a02159 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -113,7 +113,10 @@ sub run_quilt {
}
my %opts = (
env => { QUILT_PATCHES => "$absdir/debian/patches",
- QUILT_SERIES => $series },
+ QUILT_SERIES => $series,
+ # Kept as close as possible to default patch options in
+ # Dpkg::Source::Patch (used in without_quilt mode)
+ QUILT_PATCH_OPTS => "-t -F 0 -N -u -V never -g0" },
'chdir' => $dir,
'exec' => [ 'quilt', '--quiltrc', '/dev/null', @$params ],
%more_opts
@@ -168,7 +171,6 @@ sub apply_patches {
$opts{"to_file"} = "/dev/null" if $skip_auto;
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) {
foreach my $fn (keys %{$panalysis->{$patch}->{'filepatched'}}) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
