[debian-edu-commits] debian-edu/ 01/01: Adjust test-metapkgs check to not pass temp directory setting to the chroot.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository debian-edu.

commit 79f94b600043831a97596fa8f0947a48a8a3e74a
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 28 13:53:20 2014 +0200

    Adjust test-metapkgs check to not pass temp directory setting to the  chroot.
---
 debian/changelog           | 13 +++++++++++++
 debian/tests/test-metapkgs | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a309d4..a661715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+debian-edu (1.803) unstable; urgency=low
+
+  * UNRELEASED - the debian-edu package is special, while it's unreleased it
+    has to have the right distro set in the distro field of the unreleased
+    changelog entry, so we add an extra paragraph like this one until it's
+    uploaded.
+
+  [ Petter Reinholdtsen ]
+  * Adjust test-metapkgs check to not pass temp directory setting to the
+    chroot.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 28 Sep 2014 13:52:23 +0200
+
 debian-edu (1.802) unstable; urgency=high
 
   [ Wolfgang Schweer ]
diff --git a/debian/tests/test-metapkgs b/debian/tests/test-metapkgs
index 8f79614..5d3f208 100644
--- a/debian/tests/test-metapkgs
+++ b/debian/tests/test-metapkgs
@@ -11,6 +11,13 @@ at_exit() {
 
 trap at_exit INT TERM EXIT
 
+# Make sure temp directory setting do not leak into chroot.
+chroot_run() {
+    target=$1
+    shift
+    TMP= TMPDIR= TEMP= TEMPDIR= chroot $target "$@"
+}
+
 chroot_test() {
     echo
     echo "Installing Debian Edu chroot with profile $PROFILE and desktop $DESKTOP"
@@ -30,12 +37,12 @@ chroot_test() {
     apt-get source debian-edu-config 2>&1
     cp debian-edu-config-*/share/debian-edu-config/tools/debian-edu-bless \
 	$target/root/.
-    PROFILE=$PROFILE DESKTOP=$DESKTOP chroot $target \
-	sh -x /root/debian-edu-bless 2>&1
+    PROFILE=$PROFILE DESKTOP=$DESKTOP \
+	chroot_run $target sh -x /root/debian-edu-bless 2>&1
 
     # List packages with problems in Debian
-    chroot $target apt-get install -y how-can-i-help
-    chroot $target how-can-i-help --old
+    chroot_run $target apt-get install -y how-can-i-help
+    chroot_run $target how-can-i-help --old
 
     umount $target/proc
     umount="$target/sys"
@@ -49,7 +56,8 @@ chroot_test() {
 LC_ALL=C
 export LC_ALL
 
-# Undo the effect of libpam-tmpdir in case it is active
+# Undo the effect of libpam-tmpdir in case it is active, and use the
+# test specific temp directory.
 export TMP=$ADTTMP
 export TMPDIR=$ADTTMP
 export TEMP=$ADTTMP

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