This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=5cd52673aabdf5eaa58181972119a41041fc85f2 commit 5cd52673aabdf5eaa58181972119a41041fc85f2 Author: Guillem Jover <[email protected]> AuthorDate: Mon Jul 23 13:13:19 2018 +0200 dpkg-buildpackage: Fix --rules-file option parsing Parse --rules-file instead of --rules-target, which made it a no-op. Fixes: commit 293bd243a19149165fc4fd8830b16a51d471a5e9 Stable-Candidate: 1.18.x --- debian/changelog | 2 ++ scripts/dpkg-buildpackage.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 14a311e31..1cee622ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium for short key IDs and warn for long key IDs. * On the dpkg conffile prompt, print the set of environment variables setup for the conffile shell, for easier discoverability. + * Fix dpkg-buildpackage option --rules-file parsing. It was trying to parse + it as --rules-target, which due to the ordering was a no-op. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo <[email protected]> diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index ee41555d7..ea2c61a47 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -346,7 +346,7 @@ while (@ARGV) { } elsif (m/^-[EW]$/) { # Deprecated option warning(g_('-E and -W are deprecated, they are without effect')); - } elsif (/^-R(.*)$/ or /^--rules-target=(.*)$/) { + } elsif (/^-R(.*)$/ or /^--rules-file=(.*)$/) { my $arg = $1; @debian_rules = split ' ', $arg; } else { -- Dpkg.Org's dpkg
