diff options
| author | Guillem Jover <guillem@debian.org> | 2018-01-03 01:57:30 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2018-01-16 11:26:35 +0100 |
| commit | f6095fa5db1e4d277a0660806875375d60286250 (patch) | |
| tree | aeabc904f2ea422473a2fd7dfe4ec50d1d50dbe1 | |
| parent | 28fee8b445cd94bf7efd76f6c3fd0c62bdf94b6d (diff) | |
| download | dpkg-f6095fa5db1e4d277a0660806875375d60286250.tar.gz | |
dpkg-buildpackage: Do not set DEB_GAIN_ROOT_CMD on <implementations-keywords>
The specification is clear on this, and we should not be setting this
variable when the values are different to "no" and "binary-targets".
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/dpkg-buildpackage.pl | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index bd41680a4..c6080560c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium the variable is expected to be set by any builder, not just dpkg. And introduce ephemereal backwards compatibility even though there are no known users. + * Do not set DEB_GAIN_ROOT_CMD in dpkg-buildpackage when the R³ value is + <implementations-keywords>, following the specification. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org> diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 4b3e2b9d6..d790b3177 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -723,6 +723,11 @@ sub parse_rules_requires_root { $ENV{DEB_GAIN_ROOT_CMD} = join ' ', @rootcommand; # XXX: For ephemeral backwards compatibility. $ENV{DPKG_GAIN_ROOT_CMD} = $ENV{DEB_GAIN_ROOT_CMD}; + } else { + # We should not provide the variable otherwise. + delete $ENV{DEB_GAIN_ROOT_CMD}; + # XXX: For ephemeral backwards compatibility. + delete $ENV{DPKG_GAIN_ROOT_CMD}; } return %rrr; |