Changeset 9d55d85 for common

Timestamp:

03/12/2010 03:46:12 AM (14 years ago)

Author:

Thomas Pegg <thomasp@…>

Branches:

2.3, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

11b4d99

Parents:

de63126

Message:

Enhance messages produced by jhalfs when files do not exist in either /sources or SRC_ARCHIVE, also in cases when SRC_ARCHIVE is not set. Thanks to Tim Sarbin for the patch.

File:

• common/libs/func_download_pkgs (modified) (1 diff)

common/libs/func_download_pkgs

@@ -72 +72 @@
       fromARCHIVE=1
     else
-      echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE}${OFF}"
       fromARCHIVE=0
       # If the file does not exist yet in /sources download a fresh one
       if [ ! -f $FILE ] ; then
+        if [[ ! ("$SRC_ARCHIVE" = "") ]] ; then
+          echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE} or /sources${OFF}"
+        else
+          echo "${BOLD}${YELLOW}$FILE: not found in /sources${OFF}"
+        fi
         if ! wget $URL1 $WGETPARAM && ! wget $URL2 $WGETPARAM ; then
           gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING"
           continue
         fi
+        else
+          echo "${BOLD}${YELLOW}$FILE: using cached file in /sources${OFF}"
       fi
     fi