[debian-edu-commits] r80088 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-16 17:42:35 +0000 (Thu, 16 May 2013)
New Revision: 80088

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Make debian-edu-bless more robust by trying twice to download
packages before installing them, in case the network is flaky.
Change its default locale from nb_NO.UTF-8 to en_US.UTF-8.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-16 15:41:51 UTC (rev 80087)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-16 17:42:35 UTC (rev 80088)
@@ -7,6 +7,11 @@
   [ Holger Levsen ]
   * debian/control: remove obsolete XS-DM-Upload-Allowed: field. 
 
+  [ Petter Reinholdtsen ]
+  * Make debian-edu-bless more robust by trying twice to download
+    packages before installing them, in case the network is flaky.
+    Change its default locale from nb_NO.UTF-8 to en_US.UTF-8.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 12 May 2013 23:17:28 +0200
 
 debian-edu-config (1.704~svn80050) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-16 15:41:51 UTC (rev 80087)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-16 17:42:35 UTC (rev 80088)
@@ -81,6 +81,7 @@
 
 # 0. Install etckeeper, to keep track of changes in /etc/ (optional,
 #    highly recommended)
+apt-get update
 apt-get install -y etckeeper
 
 # 1. Add skolelinux related APT sources.
@@ -99,7 +100,7 @@
 LOCALE="$LANG"
 EOF
 
-if [ "true" == "$TESTINSTALL" ] ; then
+if [ "true" = "$TESTINSTALL" ] ; then
     echo 'TESTINSTALL="true"' >> /etc/debian-edu/config
 fi
 
@@ -115,12 +116,28 @@
     echo tasksel            tasksel/desktop            string      "$DESKTOP"
 ) | debconf-set-selections
 setup_tasksel_overrides
-if DEBCONF_FRONTEND=noninteractive DEBIAN_PRIORITY=critical \
-    tasksel --new-install ; then
+
+DEBIAN_FRONTEND=noninteractive
+export DEBIAN_FRONTEND
+
+aptcmd=$(tasksel --new-install -t | sed 's/debconf-apt-progress -- //')
+
+# First download only, to detect problems with the network.
+if $aptcmd --download-only ; then
     :
 else
+    echo "warning: downloading needed packages failed. trying again."
+    if $aptcmd --download-only ; then
+	:
+    else
+	echo "error: unable to download needed packages, tried twice"
+    fi
+fi
+if DEBIAN_PRIORITY=critical $aptcmd ; then
+    :
+else
     remove_tasksel_overrides
-    print "error: tasksel failed"
+    echo "error: tasksel failed"
     exit 1
 fi