From 1fdaaad3ddef871166b59a8f785af725be60e15b Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 6 Feb 2015 11:58:04 +0100
Subject: chroot-installation: give up for now, revert exception+retry
 handling...

---
 bin/chroot-installation.sh | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'bin/chroot-installation.sh')

diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 01b0c7c7..9962413c 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -49,23 +49,24 @@ cleanup_all() {
 }
 
 execute_ctmpfile() {
-	set -x
-	chmod +x $CTMPFILE
-	set -o pipefail		# see eg http://petereisentraut.blogspot.com/2010/11/pipefail.html
-	if ! $(sudo chroot $CHROOT_TARGET $TMPFILE 2>&1 | tee $TMPLOG) ; then
-		RESULT=$(egrep "Failed to fetch.*Unable to connect to" $TMPLOG || true)
-		if [ ! -z "$RESULT" ] ; then
-			echo
-			echo "Trying to workaround temporarily failure fetching packages, trying again..."
-			echo
-			sudo chroot $CHROOT_TARGET $TMPFILE
-		else
-			exit 1
-		fi
-	fi
+	sudo chroot $CHROOT_TARGET $TMPFILE
+	#set -x
+	#chmod +x $CTMPFILE
+	#set -o pipefail		# see eg http://petereisentraut.blogspot.com/2010/11/pipefail.html
+	#if ! $(sudo chroot $CHROOT_TARGET $TMPFILE 2>&1 | tee $TMPLOG) ; then
+	#	RESULT=$(egrep "Failed to fetch.*Unable to connect to" $TMPLOG || true)
+	#	if [ ! -z "$RESULT" ] ; then
+	#		echo
+	#		echo "Trying to workaround temporarily failure fetching packages, trying again..."
+	#		echo
+	#		sudo chroot $CHROOT_TARGET $TMPFILE
+	#	else
+	#		exit 1
+	#	fi
+	#fi
 	rm $CTMPFILE
-	set +o pipefail
-	set +x
+	#set +o pipefail
+	#set +x
 	echo "Debug: This should only be printed on success."
 }
 
-- 
cgit v1.2.3-54-g00ecf