Merge lp:~dpigott/lava-master-image-scripts/license-wrap-change into lp:lava-master-image-scripts

[Dave Pigott]

Add support so that if the license check isn't needed it gets bypassed (i.e. if we're in the Linaro office behind the firewall)

=== modified file 'lava-create-master'
--- lava-create-master	2012-03-23 14:38:16 +0000
+++ lava-create-master	2012-03-27 15:53:31 +0000
@@ -180,11 +180,17 @@
         --user-agent="lava-create-master ($LAVA_VERSION)" \
         --quiet \
         "$2"; then
-        echo "Error: unable to download: $1" >&2
+        if test -z "$LICENSE_WRAP"; then
+            # don't report error if we might have to do license wrap
+            echo "Error: unable to download: $1" >&2
+        fi
         return 1
     fi
     if ! check_md5_or_remove "$1" "$3"; then
-        echo "Error: checksum mismatch for $1" >&2
+        if test -z "$LICENSE_WRAP"; then
+            # don't report error if we might have to do license wrap
+            echo "Error: checksum mismatch for $1" >&2
+        fi
         return 1
     else
         return 0
@@ -265,16 +271,18 @@
     if [ -e cache/$dev-vanilla.img ]; then
         verbose " * Re-using existing vanilla image: cache/$dev-vanilla.img"
     else
-        # Select the right download function and download hwpack
-        if test -n "$LICENSE_WRAP"; then
-            download_fn=${dev}_download_and_md5
-        else
-            download_fn=download_and_md5
-        fi
+        # Try non-license download first in case we're in the lab
         verbose " * Downloading/checking hardware pack..."
-        if ! $download_fn "cache/$HWPACK" "$HWPACK_URL" "$HWPACK_MD5"; then
-            echo "Error: unable to download hwpack" >&2
-            exit 1
+        if ! download_and_md5 "cache/$HWPACK" "$HWPACK_URL" "$HWPACK_MD5"; then
+            if test -n "$LICENSE_WRAP"; then
+                if ! ${dev}_download_and_md5 "cache/$HWPACK" "$HWPACK_URL" "$HWPACK_MD5"; then
+                    echo "Error: unable to download hwpack/verify license" >&2
+                    exit 1
+                fi
+            else
+                echo "Error: unable to download hwpack" >&2
+                exit 1
+            fi
         fi
 
         # chown hwpack for convenience