Upgrade to libusb-1.0.19

[hvlinux.git] / functions / fpkg

diff --git a/functions/fpkg b/functions/fpkg
index b5c06c6..673299b 100644 (file)
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -216,29 +216,23 @@ update_packages_init()
        return 1
     fi
 
-    if [ -n "${USE_LFS_PATCHES}" ]; then
-        # Getting list of all patches from LFS server.
-        set +e
-        rcmd "Fetching LFS  patches list" static_fetch_patches_list \
-            ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST}
-        set -e
-    fi
+    # Temporary deactivate error checking.
+    set +e
 
-    if [ -n "${USE_BLFS_PATCHES}" ]; then
-        # Getting list of all patches from BLFS server.
-        set +e
-        rcmd "Fetching BLFS patches list" static_fetch_patches_list \
-            ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST}
-        set -e
-    fi
+    # Getting list of all patches from LFS server.
+    rcmd "Fetching LFS  patches list" static_fetch_patches_list \
+        ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST}
 
-    if [ -n "${USE_CLFS_PATCHES}" ]; then
-        # Getting list of all patches from CLFS server.
-        set +e
-        rcmd "Fetching CLFS patches list" static_fetch_patches_list \
-            ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST}
-        set -e
-    fi
+    # Getting list of all patches from BLFS server.
+    rcmd "Fetching BLFS patches list" static_fetch_patches_list \
+        ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST}
+
+    # Getting list of all patches from CLFS server.
+    rcmd "Fetching CLFS patches list" static_fetch_patches_list \
+        ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST}
+
+    # Reactivate error checking.
+    set -e
 }
 
 # Get patch for package if it is not in the repository
@@ -295,20 +289,14 @@ static_getpatch()
        return 1
     fi
 
-    if [ -n "${USE_LFS_PATCHES}" ]; then
-        # Checking if patch is available from LFS.
-        static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL}
-    fi
+    # Checking if patch is available from LFS.
+    static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL}
 
-    if [ -n "${USE_BLFS_PATCHES}" ]; then
-        # Checking if patch is available from BLFS.
-        static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL}
-    fi
+    # Checking if patch is available from BLFS.
+    static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL}
 
-    if [ -n "${USE_CLFS_PATCHES}" ]; then
-        # Checking if patch is available from CLFS.
-        static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL}
-    fi
+    # Checking if patch is available from CLFS.
+    static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL}
 }
 
 detect_file_not_found()
@@ -652,10 +640,15 @@ fpkg()
             rm ${DEST_FILE}
         fi
 
-        if [ !  -f ${DEST_FILE} ]; then
+        if [ ! -f ${DEST_FILE} ]; then
             # Fetch package
             set +e
             static_getpkg ${SRC_FILENAME} ${URL} ${FILE_EXT}
+            rc=$?
+
+            if [ ${rc} -ne 0 ]; then
+                return ${rc};
+            fi
             set -e
 
             # Move file if source filename is not equal to package name and/or