[PATCH quantal, precise, oneiric] UBUNTU: [Config] getabis enhancements

[Stefan Bader]

- Allow to define DEBIAN to be run standalone
- Limit the amount of time wget waits for connections
- Prevent exposing some errors when called by python script
- Print architecture of downloaded packages

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian/scripts/misc/getabis |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis
index b35639c..2e77f23 100755
--- a/debian/scripts/misc/getabis
+++ b/debian/scripts/misc/getabis
@@ -1,12 +1,14 @@
 #!/bin/bash
 
-. debian/debian.env
-
 if [ "$#" != "2" ]; then
 	echo "Usage: $0 <release> <revision>" 1>&2
 	exit 1
 fi
 
+if [ "$DEBIAN" = "" ]; then
+	. debian/debian.env
+fi
+
 ver=$1
 revision=$2
 abi=$(echo $revision | awk -F. '{print $1}')
@@ -14,7 +16,7 @@ abi=$(echo $revision | awk -F. '{print $1}')
 verabi=$ver-$abi
 verfull=$ver-$revision
 
-WGET="wget --quiet -c"
+WGET="wget --tries=1 --timeout=10 --quiet -c"
 
 abidir="`pwd`/$DEBIAN/abi/$verfull"
 tmpdir="`pwd`/abi-tmp-$verfull"
@@ -38,7 +40,7 @@ getall() {
 			echo "Exists: $sub"
 			continue
 		fi
-		echo -n "Fetching $sub..."
+		echo -n "Fetching $sub($arch)..."
 		prefixes=""
 		filenames=""
 		cd $tmpdir
@@ -76,7 +78,8 @@ getall() {
 				$abidir/$arch/$sub.modules
 			(
 				cd tmp;
-				ko=`find lib/modules/$verabi-$sub/kernel -name '*.ko' | head -1`
+				ko=$(find lib/modules/$verabi-$sub/kernel \
+					-name '*.ko' | head -1)
 				readelf -p .comment "$ko" | awk '
 					($1 == "[") {
 						printf("%s", $3);
-- 
1.7.9.5