[debian-edu-commits] r80927 - trunk/src/build/CD-administrator

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-18 18:27:53 +0000 (Tue, 18 Jun 2013)
New Revision: 80927

Modified:
   trunk/src/build/CD-administrator/wanted-list
Log:
Make sure the rewrite in r80838 actually work.

Modified: trunk/src/build/CD-administrator/wanted-list
===================================================================
--- trunk/src/build/CD-administrator/wanted-list	2013-06-18 18:11:10 UTC (rev 80926)
+++ trunk/src/build/CD-administrator/wanted-list	2013-06-18 18:27:53 UTC (rev 80927)
@@ -24,34 +24,29 @@
 
 wpkg="wantedpkglist-$SUITE.txt"
 
-if [ -f hintpkgs-common.txt ] ; then
-    cat hintpkgs-common.txt
-fi
+(
+    if [ -f hintpkgs-common.txt ] ; then
+	cat hintpkgs-common.txt
+    fi
 
-case $SUITE in 
+    case $SUITE in 
 	#the netinstallers only needs udebs, so the tasks are irrelevant. 
 	*wheezy-*-netinst*)
-	(
 		hintpkgs="hintpkgs-wheezy-netinst.txt"
                 svn -q update $hintpkgs >/dev/null 2>&1
 		
 		[ -f $hintpkgs ] && cat $hintpkgs
-
-	) > $wpkg.new
 	;;
 	#the netinstallers only needs udebs, so the tasks are irrelevant. 
 	*netinst*)
-	(
 		hintpkgs="hintpkgs-netinst.txt"
                 svn -q update $hintpkgs >/dev/null 2>&1
 		
 		[ -f $hintpkgs ] && cat $hintpkgs
 
-	) > $wpkg.new
 	;;
 	#all images with a repo on them.
 	*)
-	(
 		svn -q update $hintpkgs $extrapkgs >/dev/null 2>&1
 
 		[ -f $hintpkgs ] && cat $hintpkgs
@@ -86,11 +81,12 @@
 		
 		#noop to finish without previous errors.
 		:
-	) > $wpkg.new
 	;;
 
-esac
+    esac
 
+) > $wpkg.new
+
 if grep -q error: $wpkg.new ; then
 	exit 1
 else