X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fdisk-image-builder%2Fubuntu%2Fbuild.sh;fp=resources%2Ftools%2Fdisk-image-builder%2Fubuntu%2Fbuild.sh;h=33634adf02df6dde9d9c375eddeed12c6fceb0a2;hp=c94f4458012e318a0ae3ba98b548fa615e976ab4;hb=025d95939e2c14658204b307420fc75656a90ca7;hpb=d60c62fdcf6d088b7a2769ebfc25d42154864878

diff --git a/resources/tools/disk-image-builder/ubuntu/build.sh b/resources/tools/disk-image-builder/ubuntu/build.sh
index c94f445801..33634adf02 100755
--- a/resources/tools/disk-image-builder/ubuntu/build.sh
+++ b/resources/tools/disk-image-builder/ubuntu/build.sh
@@ -192,6 +192,9 @@ unzip -n ${PACKER_DIR}/packer*zip -d ${PACKER_DIR}
 
 ## APT
 
+# This seems to be where Ubuntu keeps superseded versions of packages
+LAUNCHPAD_URL='https://launchpad.net/ubuntu/+archive/primary/+files/'
+
 rm -fr ${OUTPUT_DIR}
 mkdir -p ${OUTPUT_DIR}/temp/deb
 mkdir -p ${APT_CACHE_DIR}
@@ -202,11 +205,16 @@ do
   # Download if not already present
   if [ ! -f ${APT_CACHE_DIR}/$name ]
   then
-    wget -P ${APT_CACHE_DIR} -O ${APT_CACHE_DIR}/$name ${url//\'}
+    if ! wget -P ${APT_CACHE_DIR} -O ${APT_CACHE_DIR}/$name ${url//\'}
+    then
+      echo "WARNING: Unable to get package using previously recorded URL, may"
+      echo "         be superseded. Trying launchpad instead."
+      wget -P ${APT_CACHE_DIR} -O ${APT_CACHE_DIR}/$name "${LAUNCHPAD_URL}${name}"
+    fi
   fi
 
   # Verify checksum (always -- regardless of whether the package was
-  # just downloaded, or already tehere
+  # just downloaded, or was already there
   actual_md5sum=$(${MD5UTIL} < ${APT_CACHE_DIR}/$name)
   if [ ! "${actual_md5sum:0:32}" = "${checksum:7}" ]
   then