[debian-edu-commits] debian-edu/ 02/02: Adjust test-metapkgs scripts to use debian-edu-bless from the debian-edu-config binary package if it is present.

[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 484485635fb26dcc6c86cf13de09d88f71fbce6b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 7 10:49:10 2014 +0200

    Adjust test-metapkgs scripts to use debian-edu-bless from the debian-edu-config binary package if it is present.
---
 debian/changelog           |  4 ++++
 debian/tests/test-metapkgs | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5af786c..28bf7d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ debian-edu (1.805) unstable; urgency=low
     changelog entry, so we add an extra paragraph like this one until it's
     uploaded.
 
+  [ Petter Reinholdtsen ]
+  * Adjust test-metapkgs scripts to use debian-edu-bless from the
+    debian-edu-config binary package if it is present.
+
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 Oct 2014 10:47:54 +0200
 
 debian-edu (1.804) unstable; urgency=high
diff --git a/debian/tests/test-metapkgs b/debian/tests/test-metapkgs
index 5d3f208..4000556 100644
--- a/debian/tests/test-metapkgs
+++ b/debian/tests/test-metapkgs
@@ -33,10 +33,15 @@ chroot_test() {
     mount -t sysfs sysfs $target/sys
     umount="$target/proc $target/sys"
 
-    # The bless script is not yet part of any binary package
-    apt-get source debian-edu-config 2>&1
-    cp debian-edu-config-*/share/debian-edu-config/tools/debian-edu-bless \
+    # The bless script is recently part of the debian-edu-config package.
+    if [ -x /usr/share/debian-edu-config/tools/debian-edu-bless ] ; then
+	cp /usr/share/debian-edu-config/tools/debian-edu-bless
 	$target/root/.
+    else
+	apt-get source debian-edu-config 2>&1
+	cp debian-edu-config-*/share/debian-edu-config/tools/debian-edu-bless \
+	    $target/root/.
+    fi
     PROFILE=$PROFILE DESKTOP=$DESKTOP \
 	chroot_run $target sh -x /root/debian-edu-bless 2>&1
 

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