[debhelper-devel] [Git][debian/debhelper][master] Dh_Lib: Fix invalid parameter for package_cross_type

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
7025d4f3 by Niels Thykier at 2018-02-26T19:38:26+00:00
Dh_Lib: Fix invalid parameter for package_cross_type

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


3 changed files:

- Makefile
- debian/changelog
- lib/Debian/Debhelper/Dh_Lib.pm


Changes:

=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ MAKEMANLIST=$(PERL) -e ' \
 		} \
 		END { \
 			my $$recommended_compat = q{$(VERSION)}; \
-			$$recommended_compat =~ s{\..*}{}; \
+			$$recommended_compat =~ s{^\d+\K(?:\D.*|\..*)?}{}; \
 			while (<STDIN>) { \
 				s/\#LIST\#/$$list/g; \
 				s/\#LIST_DEPRECATED\#/$$list_deprecated/g; \


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+debhelper (11.1.6) UNRELEASED; urgency=medium
+
+  * Dh_Lib: Avoid passing invalid parameters to a function, which
+    caused tons of "package ARRAY(...) is not in control info"
+    warnings from dh in some cases.  It triggers when dh thinks
+    the package might have architecture qualified debhelper config
+    files.  The warning is harmless (besides the noise) for all
+    native builds and most cross builds, but it did invalidate
+    attempt to make pkgfile() use "DEB_TARGET_ARCH{,_OS}"
+    (see 11.1.5~alpha1).  Thanks to Andreas Beckmann for reporting
+    the issue.  (Closes: #891546)
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 26 Feb 2018 19:32:52 +0000
+
 debhelper (11.1.5) unstable; urgency=medium
 
   * Upload to unstable.


=====================================
lib/Debian/Debhelper/Dh_Lib.pm
=====================================
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -817,7 +817,7 @@ sub default_sourcedir {
 			for my $pkg (@{$package}) {
 				push(@try, "debian/${pkg}.${filename}");
 				if ($check_expensive) {
-					my $cross_type = uc(package_cross_type($package));
+					my $cross_type = uc(package_cross_type($pkg));
 					push(@try,
 						 "debian/${pkg}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH"),
 						 "debian/${pkg}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH_OS"),



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/7025d4f38f2d263634932cd5faf32442c41015f7

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/7025d4f38f2d263634932cd5faf32442c41015f7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180226/15916a89/attachment-0001.html>