Browse Source

dpkg-source: ensure debian/source/local-options is always excluded

It should be excluded even if the user provides -I or -i options to
override the lists of files to ignore.

Reported-by: Robert Luberda <robert@debian.org>
Raphaël Hertzog 16 years ago
parent
commit
2290a1248a
2 changed files with 6 additions and 1 deletions
  1. 5 0
      debian/changelog
  2. 1 1
      scripts/Dpkg/Source/Package.pm

+ 5 - 0
debian/changelog

@@ -1,5 +1,10 @@
 dpkg (1.15.8.6) UNRELEASED; urgency=low
 
+  [ Raphaël Hertzog ]
+  * Ensure debian/source/local-options is always excluded from the source
+    package even if the user provides customized -i or -I options.
+    Closes: #597023
+
   [ Updated man page translations ]
   * French (Christian Perrier).
   * Spanish (Omar Campagne). Closes: #596519

+ 1 - 1
scripts/Dpkg/Source/Package.pm

@@ -88,7 +88,6 @@ RCS
 _MTN
 _darcs
 {arch}
-debian/source/local-options
 );
 
 # Object methods
@@ -122,6 +121,7 @@ sub init_options {
     } else {
         $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ];
     }
+    push @{$self->{'options'}{'tar_ignore'}}, "debian/source/local-options";
     # Skip debianization while specific to some formats has an impact
     # on code common to all formats
     $self->{'options'}{'skip_debianization'} ||= 0;