Bladeren bron

dpkg-source: Update default diff ignore regex on --extend-diff-ignore

The Dpkg::Source::Package formats >= V2, expect an updated default
diff ignore regex when --extend-diff-ignore is used, for example in
the debian/source/options file, but no --diff-ignore argument is
passed.

This partially reverts commit 1cccaf0d0c509f9ac77f5448a0573e2d1c9c1ae4,
which introduced this regression.
Guillem Jover 12 jaren geleden
bovenliggende
commit
5d8db1edd4
1 gewijzigde bestanden met toevoegingen van 2 en 0 verwijderingen
  1. 2 0
      scripts/dpkg-source.pl

+ 2 - 0
scripts/dpkg-source.pl

@@ -43,6 +43,7 @@ use Dpkg::Version;
 use Dpkg::Vars;
 use Dpkg::Vars;
 use Dpkg::Changelog::Parse;
 use Dpkg::Changelog::Parse;
 use Dpkg::Source::Package qw(get_default_diff_ignore_regex
 use Dpkg::Source::Package qw(get_default_diff_ignore_regex
+                             set_default_diff_ignore_regex
                              get_default_tar_ignore_pattern);
                              get_default_tar_ignore_pattern);
 use Dpkg::Vendor qw(run_vendor_hook);
 use Dpkg::Vendor qw(run_vendor_hook);
 
 
@@ -175,6 +176,7 @@ while (@options) {
 	if ($options{diff_ignore_regex}) {
 	if ($options{diff_ignore_regex}) {
 	    $options{diff_ignore_regex} .= "|$1";
 	    $options{diff_ignore_regex} .= "|$1";
 	}
 	}
+	set_default_diff_ignore_regex($diff_ignore_regex);
     } elsif (m/^-(?:I|-tar-ignore=)(.+)$/) {
     } elsif (m/^-(?:I|-tar-ignore=)(.+)$/) {
         push @{$options{tar_ignore}}, $1;
         push @{$options{tar_ignore}}, $1;
     } elsif (m/^-(?:I|-tar-ignore)$/) {
     } elsif (m/^-(?:I|-tar-ignore)$/) {