[debian-edu-commits] debian-edu/ 01/01: Make sure test-metapkgs also set the debian edu suite, to find the correct local repo.

[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 c1b4dba5a7c8f810d6cdbbfd1b1db8624ec11431
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 7 12:03:43 2014 +0200

    Make sure test-metapkgs also set the debian edu suite, to find the correct local repo.
---
 debian/changelog           | 2 ++
 debian/tests/test-metapkgs | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 28bf7d0..d3a49db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ debian-edu (1.805) unstable; urgency=low
   [ Petter Reinholdtsen ]
   * Adjust test-metapkgs scripts to use debian-edu-bless from the
     debian-edu-config binary package if it is present.
+  * Make sure test-metapkgs also set the debian edu suite, to find the
+    correct local repo.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 Oct 2014 10:47:54 +0200
 
diff --git a/debian/tests/test-metapkgs b/debian/tests/test-metapkgs
index 4000556..436d600 100644
--- a/debian/tests/test-metapkgs
+++ b/debian/tests/test-metapkgs
@@ -25,6 +25,7 @@ chroot_test() {
     cd $ADTTMP
     target=test-chroot
     suite=testing
+    edusuite=jessie
     debootstrap $suite $target
     printf "#!/bin/sh\nexit 101\n" > $target/usr/sbin/policy-rc.d
     chmod a+rx $target/usr/sbin/policy-rc.d
@@ -42,7 +43,7 @@ chroot_test() {
 	cp debian-edu-config-*/share/debian-edu-config/tools/debian-edu-bless \
 	    $target/root/.
     fi
-    PROFILE=$PROFILE DESKTOP=$DESKTOP \
+    PROFILE=$PROFILE DESKTOP=$DESKTOP EDUSUITE=$edusuite \
 	chroot_run $target sh -x /root/debian-edu-bless 2>&1
 
     # List packages with problems in Debian

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