[Reproducible-commits] [debhelper] 03/16: Revert "dh_installdocs: Error out on unsafe binNMUs with --link-doc"
Jérémy Bobbio
lunar at moszumanska.debian.org
Thu Jan 1 18:26:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch pu/reproducible_builds
in repository debhelper.
commit ca9d8858dc0c5bda16d3c7dbe6e6642f08835cee
Author: Niels Thykier <niels at thykier.net>
Date: Mon Dec 29 10:14:13 2014 +0100
Revert "dh_installdocs: Error out on unsafe binNMUs with --link-doc"
This reverts commit 97993b514bfbcc84c213e9e5d68c1b1c3a833ce7.
---
Debian/Debhelper/Dh_Getopt.pm | 17 +----------------
dh_installdocs | 20 +++-----------------
2 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 3468071..e4f3e47 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:
diff --git a/dh_installdocs b/dh_installdocs
index 30899a0..af10898 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -159,7 +159,6 @@ init(options => {
});
my $called_getpackages = 0;
-my $link_doc_arch;
foreach my $package (@{$dh{DOPACKAGES}}) {
next if is_udeb($package);
@@ -169,22 +168,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $link_doc=($dh{LINK_DOC} && $dh{LINK_DOC} ne $package);
if ($link_doc) {
- my $has_issue = 0;
- unless ($called_getpackages++) {
- # Called for the side-effect of making package_arch work.
- getpackages('both');
- $link_doc_arch = package_arch($dh{LINK_DOC});
- # Check for broken --link-doc during binNMUs.
- for my $excl_pkg (@{$dh{_INTERNAL_EXCL_DOPACKAGES}}) {
- if (package_arch($excl_pkg) ne $link_doc_arch) {
- $has_issue = $excl_pkg;
- last;
- }
- }
- }
+ getpackages('both') unless $called_getpackages++;
- $has_issue = $package if (package_arch($package) ne $link_doc_arch);
- if ($has_issue) {
+ if (package_arch($package) ne package_arch($dh{LINK_DOC})) {
if (compat(9)) {
my $changelog=pkgfile($package, 'changelog') || 'debian/changelog';
if (! -e $changelog) {
@@ -200,7 +186,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
error("Aborting build as this is a binNMU (leading to a broken package)");
}
} else {
- error("--link-doc not allowed between ${has_issue} and $dh{LINK_DOC} (one is all and the other not)");
+ error("--link-doc not allowed between ${package} and $dh{LINK_DOC} (one is all and the other not)");
}
}
# Make sure that the parent directory exists.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git
More information about the Reproducible-commits
mailing list