diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:18:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:18:02 +0000 |
| commit | b42d43f61cb58f9be62016fc82ee40fe2bb062ab (patch) | |
| tree | 05d89790c14316f56e4ebcfa9932ae82a5982223 /lib/Debian/Debhelper | |
| parent | Releasing progress-linux version 13.18-0.0~progress7.99u1. (diff) | |
| download | debhelper-b42d43f61cb58f9be62016fc82ee40fe2bb062ab.tar.xz debhelper-b42d43f61cb58f9be62016fc82ee40fe2bb062ab.zip | |
Merging upstream version 13.19.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/Debian/Debhelper')
| -rw-r--r-- | lib/Debian/Debhelper/Dh_Lib.pm | 4 |
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"), |