[dpkg] 03/06: dpkg-buildpackage: Pass the debian/control source stanza to R³ parser

[Mattia Rizzolo]

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

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

commit 20ff9bdb8ff8c7919ce5424f4ae18a4d4074d80b
Author: Guillem Jover <guillem at debian.org>
Date:   Thu Oct 19 00:51:54 2017 +0200

    dpkg-buildpackage: Pass the debian/control source stanza to R³ parser
    
    This meant the field was being ignored.
    
    (cherry picked from commit 96547b59076841cb85a2682870cf6742dbb9a3e3)
---
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.pl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44ade92..8d2d63b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dpkg (1.19.0.3) UNRELEASED; urgency=medium
 
+  * Pass the correct source stanza to the dpkg-buildpackage code parsing the
+    Rules-Requires-Root field. This meant the field was being ignored.
   * Packaging:
     - Comment out Rules-Requires-Root field until debhelper supports it.
 
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 0705aca..df2e1bb 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -464,7 +464,7 @@ $ENV{SOURCE_DATE_EPOCH} ||= $changelog->{timestamp} || time;
 
 # Check whether we are doing some kind of rootless build, and sanity check
 # the fields values.
-my %rules_requires_root = parse_rules_requires_root($ctrl);
+my %rules_requires_root = parse_rules_requires_root($ctrl->get_source());
 
 my @arch_opts;
 push @arch_opts, ('--host-arch', $host_arch) if $host_arch;

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