[debian-edu-commits] r80043 - branches/wheezy/debian-edu-config/share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-10 09:45:41 +0000 (Fri, 10 May 2013)
New Revision: 80043

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Report tasksel errors and clean up diverts if tasksel fail.

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-09 21:32:49 UTC (rev 80042)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-10 09:45:41 UTC (rev 80043)
@@ -111,8 +111,14 @@
     echo tasksel            tasksel/desktop            string      "$DESKTOP"
 ) | debconf-set-selections
 setup_tasksel_overrides
-DEBCONF_FRONTEND=noninteractive DEBIAN_PRIORITY=critical tasksel --new-install
-remove_tasksel_overrides
+if DEBCONF_FRONTEND=noninteractive DEBIAN_PRIORITY=critical \
+    tasksel --new-install ; then
+    :
+else
+    remove_tasksel_overrides
+    print "error: tasksel failed"
+    exit 1
+fi
 
 # 5. Run cfengine to configure everything that could not be done using
 #    preseeding.