X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Ffpkg;h=ee290c5d60f34655547dde689adfcaa9c6eb05c4;hb=f15d04ba11644be74d2bbdc9e01ec2a4ec49d2e7;hp=7be29602274b3f76a6080c71fc5a2f59c7ac1b83;hpb=0b50a2a2ae9f3ec72bcc2993aef1d57faa38dc66;p=hvlinux.git

diff --git a/functions/fpkg b/functions/fpkg
index 7be2960..ee290c5 100644
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -338,35 +338,50 @@ static_getpkg()
         PREFERRED_EXT="${DEFAULT_ARCH_EXT_LIST}"
     fi
 
-    for arch_ext in ${PREFERRED_EXT}; do
-        wget_wrapper ${URL} ${PACK}.${arch_ext}
-        wget_wrapper_status=$?
+    wget_wrapper_status=
+    url_list="${URL}"
 
-        if [ ${wget_wrapper_status} -eq 1 ]; then
-            return 1;
-        fi
+    if [ x"${URL}" != x"${HV_PACKAGES_URL}" ]; then
+        url_list+=" ${HV_PACKAGES_URL}"
+    fi
 
-        if [ ${wget_wrapper_status} -eq 2 ]; then
-            continue;
-        fi
+    for url in ${url_list}; do
+        for arch_ext in ${PREFERRED_EXT}; do
+            wget_wrapper ${url} ${PACK}.${arch_ext}
+            wget_wrapper_status=$?
 
-        # If we are here, it means the file was successfully downloaded.
-        FINAL_EXT=${arch_ext}
+            #if [ ${wget_wrapper_status} -eq 1 ]; then
+            #    return 1;
+            #fi
 
-        # Convert to bzip2 format if requested and if it is a tar/gz archive
-        if [ -n "${PREFER_BZIP2_ARCHIVE}" ]; then
-            if is_extension_tar_gzip "${arch_ext}" ; then
-                rcmd "Converting ${PACK}.${arch_ext} to bzip2 format" \
-                    gztobz2 ${LFS_PKG_DIR}/${PACK}.${arch_ext}
-                FINAL_EXT="tar.bz2"
+            if [ ${wget_wrapper_status} -eq 0 ]; then
+                break;
             fi
-        fi
+        done
 
-        return $?
+        if [ ${wget_wrapper_status} -eq 0 ]; then
+            break;
+        fi
     done
 
     # Failure or file not found
-    return 1
+    if [ ${wget_wrapper_status} -gt 0 ]; then
+        return 1;
+    fi
+
+    # If we are here, it means the file was successfully downloaded.
+    FINAL_EXT=${arch_ext}
+
+    # Convert to bzip2 format if requested and if it is a tar/gz archive
+    if [ -n "${PREFER_BZIP2_ARCHIVE}" ]; then
+        if is_extension_tar_gzip "${arch_ext}" ; then
+            rcmd "Converting ${PACK}.${arch_ext} to bzip2 format" \
+                 gztobz2 ${LFS_PKG_DIR}/${PACK}.${arch_ext}
+            FINAL_EXT="tar.bz2"
+        fi
+    fi
+
+    return 0
 }
 
 # Test integrity of archive