diff options
| author | Niels Thykier <niels@thykier.net> | 2014-12-29 10:14:13 +0100 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2014-12-29 10:14:13 +0100 |
| commit | ca9d8858dc0c5bda16d3c7dbe6e6642f08835cee (patch) | |
| tree | 30ab36a75811f45b5595d338a0de94484a213c39 /Debian | |
| parent | 46d77cb8c5e74d156dada5498ded93ade09010ad (diff) | |
| download | debhelper-ca9d8858dc0c5bda16d3c7dbe6e6642f08835cee.tar.gz | |
Revert "dh_installdocs: Error out on unsafe binNMUs with --link-doc"
This reverts commit 97993b514bfbcc84c213e9e5d68c1b1c3a833ce7.
Diffstat (limited to 'Debian')
| -rw-r--r-- | Debian/Debhelper/Dh_Getopt.pm | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 3468071a..e4f3e471 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -182,7 +182,7 @@ sub split_options_string { sub parseopts { my %params=@_; - my (@ARGV_extra, %internal_excluded); + my @ARGV_extra; # DH_INTERNAL_OPTIONS is used to pass additional options from # dh through an override target to a command. @@ -199,7 +199,6 @@ sub parseopts { foreach my $package (getpackages()) { if (! grep { $_ eq $package } @{$dh{DOPACKAGES}}) { $exclude_package{$package}=1; - $internal_excluded{$package}=1; } } } @@ -261,14 +260,6 @@ sub parseopts { $packages_seen{$package}=1; push @package_list, $package; } - } elsif ($internal_excluded{$package}) { - # Record packages we would have processed if not for - # DH_INTERNAL_OPTIONS. - # We need this for dh_installdocs to check for broken - # binNMUs with --link-doc - push @{$dh{_INTERNAL_EXCL_DOPACKAGES}}, $package; - # Remove it to avoid duplicates - delete $internal_excluded{$package}; } } @{$dh{DOPACKAGES}}=@package_list; @@ -295,9 +286,3 @@ sub parseopts { } 1 - -# Local Variables: -# indent-tabs-mode: t -# tab-width: 4 -# cperl-indent-level: 4 -# End: |