summaryrefslogtreecommitdiffstats
path: root/lib/Debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:18:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:18:01 +0000
commit6dcb7594f45f8e1ae3088099884d416e15580342 (patch)
treee724a496a95bb588a1dc95c60d53ed63b6afabdc /lib/Debian
parentAdding debian version 13.18. (diff)
downloaddebhelper-6dcb7594f45f8e1ae3088099884d416e15580342.tar.xz
debhelper-6dcb7594f45f8e1ae3088099884d416e15580342.zip
Merging upstream version 13.19.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/Debian')
-rw-r--r--lib/Debian/Debhelper/Dh_Lib.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index d4ef875..81a6e15 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -1132,7 +1132,7 @@ sub default_sourcedir {
# globally or not. But if someone is being "clever" then the
# cache is reusable and for the general/normal case, it has no
# adverse effects.
- if (defined $dh{NAME} and $opts->{'named'}) {
+ if (defined $dh{NAME} and $named) {
$filename="$dh{NAME}.$filename";
}
@@ -1154,7 +1154,7 @@ sub default_sourcedir {
} else {
# Avoid checking for hostarch+hostos unless we have reason
# to believe that they exist.
- if ($check_expensive and $opts->{'support-architecture-restriction'}) {
+ if ($check_expensive and $support_architecture_restriction) {
my $cross_type = uc(package_cross_type($package));
push(@try,
"debian/${package}.${filename}.".dpkg_architecture_value("DEB_${cross_type}_ARCH"),