The following commit has been merged in the master branch:
commit e7b1392e467cee3b6d6052cf05710d36d05852ec
Author: Raphaël Hertzog <[email protected]>
Date: Fri Apr 2 09:16:49 2010 +0200
dpkg-source: fix initialization of diff-ignore in 1.0 format
Commit 3378e8fa435abe79e9bd3cea07b02f562b906695 broke
"dpkg-source -i -b" on version 1.0 source packages. This restores it.
diff --git a/scripts/Dpkg/Source/Package/V1.pm
b/scripts/Dpkg/Source/Package/V1.pm
index ad4b826..37d762c 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -43,7 +43,11 @@ sub init_options {
my ($self) = @_;
# Don't call $self->SUPER::init_options() on purpose, V1.0 has no
# ignore by default
- $self->{'options'}{'diff_ignore_regexp'} =
'(?:^|/)debian/source/local-options$';
+ if (defined $self->{'options'}{'diff_ignore_regexp'}) {
+ $self->{'options'}{'diff_ignore_regexp'} .=
'|(?:^|/)debian/source/local-options$';
+ } else {
+ $self->{'options'}{'diff_ignore_regexp'} =
'(?:^|/)debian/source/local-options$';
+ }
$self->{'options'}{'sourcestyle'} ||= 'X';
$self->{'options'}{'skip_debianization'} ||= 0;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
