Changeset 8c2b505 for common

Timestamp:

04/01/2022 08:18:15 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

30a444a

Parents:

a2917ed

Message:

Fix small bugs in func_download_pkgs

• If MISSING_FILES.DMP is left from a preceding attempt, it may

generate a false warning a bout missing files even if they could
all be downloaded.

• do not try to copy a modified file to SRC_ARCHIVE if it already

exists: it may belong to another user...

File:

• common/libs/func_download_pkgs (modified) (4 diffs)

common/libs/func_download_pkgs

@@ -4 +4 @@
 get_sources() {              # Download file, write name to MISSING_FILES.DMP if an error
 #----------------------------#
+
+    # Test if the packages must be downloaded
+  [ ! "$GETPKG" = "y" ] && return
+
   local saveIFS=$IFS
   local IFS line URL1 URL2 FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE WGETPARAM
@@ -13 +17 @@
   WGETPARAM+=" --tries ${RETRYDOWNLOADCNT}"
   WGETPARAM+=" --timeout ${DOWNLOADTIMEOUT}"
-
-    # Test if the packages must be downloaded
-  [ ! "$GETPKG" = "y" ] && return
 
   gs_wrt_message(){
@@ -27 +28 @@
     # Generate URLs file
   create_urls
+
+    # Clean up leftovers from preceding attempts
+  >MISSING_FILES.DMP
 
   IFS=$'\x0A'  # Modify the 'internal field separator' to break on 'LF' only
@@ -111 +115 @@
       [   -d ${SRC_ARCHIVE}  ] &&
       [   -w ${SRC_ARCHIVE}  ] &&
+      [ ! -f ${SRC_ARCHIVE}/$FILE ] &&
       [ "$fromARCHIVE" = "0" ] ; then
         echo "Storing file:<$FILE> in the package archive"