Merge branch 'pu/dpkg-path' into 'master'

Set PATH=/usr/sbin:/usr/bin:/sbin:/bin when running dpkg

See merge request apt-team/apt!38

2 files changed, 38 insertions, 0 deletions

diff --git a/test/integration/framework b/test/integration/framework
index 8ec2e80cf..e7b82c273 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -482,6 +482,9 @@ EOF
 	unset GREP_OPTIONS POSIXLY_CORRECT
 	unset http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy
 
+	# Make dpkg inherit testing path
+	echo 'DPkg::Path "";\n' >> aptconfig.conf
+
 	# Make gcov shut up
 	export GCOV_ERROR_FILE=/dev/null
 
diff --git a/test/integration/test-dpkg-path b/test/integration/test-dpkg-path
new file mode 100755
index 000000000..b17b59421
--- /dev/null
+++ b/test/integration/test-dpkg-path
@@ -0,0 +1,35 @@
+#!/bin/sh
+set -e
+
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
+
+setupenvironment
+configarchitecture 'native'
+configdpkgnoopchroot
+
+# create a bunch of test pkgs
+createtestpkg() {
+	setupsimplenativepackage "testpkg-$1" 'native' '1.0' 'unstable'
+	BUILDDIR="incoming/testpkg-$1-1.0"
+	echo '#!/bin/sh
+echo PATH=$PATH' > "${BUILDDIR}/debian/preinst"
+	buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
+	rm -rf "$BUILDDIR"
+}
+
+createtestpkg 'one'
+createtestpkg 'two'
+
+setupaptarchive
+
+
+# Inherit from environment
+testsuccess aptget install testpkg-one -y -o DPkg::Path=""
+cp rootdir/tmp/testsuccess.output apt.log
+testsuccess grep "PATH=$PATH" apt.log
+
+# Set a custom value
+testsuccess aptget install testpkg-two -y -o DPkg::Path="foobar:$PATH"
+cp rootdir/tmp/testsuccess.output apt.log
+testsuccess grep "PATH=foobar:$PATH" apt.log