[dpkg] 03/05: dpkg-buildpackage: Fix logic to decide whether to call the build targets

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 1.19.0.2
in repository dpkg.

commit 029aa41244e44c6d4675ac7af69df4ce29bbe2b0
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Oct 17 21:20:53 2017 +0200

    dpkg-buildpackage: Fix logic to decide whether to call the build targets
    
    The build targets never require root, so checking them will always return
    false. We need to key on the binary target instead.
    
    This broke tons of packages that are violating Debian policy MUSTs.
    
    Thanks-to: James Clarke <jrtc27 at debian.org>
    Closes: #878899
    (cherry picked from commit a3a9527efb1345ac71014dd59da911db05e99ea0)
---
 debian/changelog             | 3 +++
 scripts/dpkg-buildpackage.pl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9724658..2d81348 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 dpkg (1.19.0.2) UNRELEASED; urgency=medium
 
+  * Fix logic in dpkg-buildpackage to decide whether to run build targets,
+    which broke tons of packages that are violating Debian policy MUSTs.
+    Thanks to James Clarke <jrtc27 at debian.org>. Closes: #878899
   * Packaging:
     - Add Breaks to libdpkg-perl against pkg-kde-tools (<< 0.15.28~), as
       that package is using private modules with no API guarantees, that
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index affcca8..e7408c2 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -580,7 +580,7 @@ my $build_types = get_build_options_from_type();
 if (build_has_any(BUILD_BINARY)) {
     # If we are building rootless, there is no need to call the build target
     # independently as non-root.
-    run_cmd(@debian_rules, $buildtarget) if rules_requires_root($buildtarget);
+    run_cmd(@debian_rules, $buildtarget) if rules_requires_root($binarytarget);
     run_hook('binary', 1);
     run_rules_cond_root($binarytarget);
 }
@@ -860,7 +860,7 @@ sub build_target_fallback {
 
     # If we are building rootless, there is no need to call the build target
     # independently as non-root.
-    return if not rules_requires_root($buildtarget);
+    return if not rules_requires_root($binarytarget);
 
     return if $buildtarget eq 'build';
     return if scalar @debian_rules != 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git