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

[pere at alioth.debian.org]

Author: pere
Date: 2013-11-07 10:04:12 +0000 (Thu, 07 Nov 2013)
New Revision: 82657

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Reorder to fix typo.

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-11-07 09:54:06 UTC (rev 82656)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-11-07 10:04:12 UTC (rev 82657)
@@ -94,6 +94,22 @@
     done
 }
 
+apt_get_harder() {
+    aptcmd="$1"
+    # 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
+    $aptcmd
+}
+
 # 0. Install etckeeper, to keep track of changes in /etc/ (optional,
 #    highly recommended)
 apt-get update
@@ -119,22 +135,6 @@
 if [ "true" = "$TESTINSTALL" ] ; then
     echo 'TESTINSTALL="true"' >> /etc/debian-edu/config
 fi
-apt_get_harder() {
-    aptcmd="$1"
-    # 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
-    $aptcmd
-}
-
 # 3. Install debian-edu-install to load preseeding values and pull in
 #    our configuration.
 apt_get_harder "apt-get install -y debian-edu-install"