[dpkg] 09/28: Dpkg::Vendor::Debian: Use proper use_feature key
Mattia Rizzolo
mattia at debian.org
Mon Jan 22 17:11:23 UTC 2018
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository dpkg.
commit 0e894ddaa68792246bd03a5dcf3f2e56fd2aeb74
Author: Guillem Jover <guillem at debian.org>
Date: Fri Oct 27 22:06:58 2017 +0200
Dpkg::Vendor::Debian: Use proper use_feature key
We need to access the features within the feature area hash now. Missed
in a previous refactoring.
Fixes: commit 2125e8dd7388e2adb9b6c837f4832fe8f0f63b25
Reported-by: Mattia Rizzolo <mattia at debian.org> (on IRC)
Closes: #881051
---
debian/changelog | 3 +++
scripts/Dpkg/Vendor/Debian.pm | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2526bac..cc537f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
- Check that $tarname is defined before use in Dpkg::Source::Package::V1.
Thanks to Christoph Biedl <debian.axhn at manchmal.in-ulm.de>.
Closes: #879124
+ - Dpkg::Vendor::Debian: Use proper %use_feature key. This was causing perl
+ errors on paths not accapted for fixdebugpath.
+ Reported by Mattia Rizzolo <mattia at debian.org>, on IRC. Closes: #881051
* Documentation:
- Update gettext minimal version in README.
- Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index e0fd011..980597b 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -204,7 +204,7 @@ sub _add_build_flags {
# so that we do not need to worry about escaping the characters
# on output.
if ($build_path =~ m/[^-+:.0-9a-zA-Z~\/_]/) {
- $use_feature{fixdebugpath} = 0;
+ $use_feature{reproducible}{fixdebugpath} = 0;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list