r3532 - jhalfs/trunk/common/libs

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Mar 11 19:46:12 PST 2010


Author: thomasp
Date: 2010-03-11 20:46:12 -0700 (Thu, 11 Mar 2010)
New Revision: 3532

Modified:
   jhalfs/trunk/common/libs/func_download_pkgs
Log:
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.



Modified: jhalfs/trunk/common/libs/func_download_pkgs
===================================================================
--- jhalfs/trunk/common/libs/func_download_pkgs	2010-03-12 03:32:25 UTC (rev 3531)
+++ jhalfs/trunk/common/libs/func_download_pkgs	2010-03-12 03:46:12 UTC (rev 3532)
@@ -71,14 +71,20 @@
       echo "$FILE: -- copied from $SRC_ARCHIVE"
       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
 




More information about the alfs-log mailing list