summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2018-01-03 01:57:30 +0100
committerGuillem Jover <guillem@debian.org>2018-01-16 11:26:35 +0100
commitf6095fa5db1e4d277a0660806875375d60286250 (patch)
treeaeabc904f2ea422473a2fd7dfe4ec50d1d50dbe1 /scripts
parent28fee8b445cd94bf7efd76f6c3fd0c62bdf94b6d (diff)
downloaddpkg-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".
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/dpkg-buildpackage.pl5
1 files changed, 5 insertions, 0 deletions
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;