From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Thu, 10 Mar 2011 04:34:00 +0000 (+0000)
Subject: Réglé problème avec fpkg: si le texte "404" se retrouvait dans le log de wget (exempl... 
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=11413e8cf4335e3cd9a5c47d7c56c17d66d2e215;p=hvlinux.git

Réglé problème avec fpkg: si le texte "404" se retrouvait dans le log de wget (exemple avec la taille du fichier), la fonction detect_file_not_found() détectait une erreur de téléchargement (erreur HTTP 404).
---

diff --git a/config/sysinfos.amd64 b/config/sysinfos.amd64
index 8e13102..25bebd5 100644
--- a/config/sysinfos.amd64
+++ b/config/sysinfos.amd64
@@ -5,7 +5,7 @@
 
 INST_TYPE="workstation"
 HVL_TARGET="x86_64"
-MAKEJOBS=10
+MAKEJOBS=4
 
 # Destination path where to install new Linux-HV system. This is usually where
 # you have mounted your new LFS partition, but it can also be any directory.
diff --git a/functions/fpkg b/functions/fpkg
index f637f54..0fd60c5 100644
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -158,17 +158,15 @@ static_getpatch()
 
 detect_file_not_found()
 {
-    # HTTP: will return error code 404.
+    # HTTP: will return "ERROR 404: Not Found"
     # FTP: will say "File not found"
-    if grep "404" ${WGET_LOG_FILE} 1> /dev/null 2>&1; then
-        #echo "404 NOTFOUND"
+    if grep --ignore-case "not found" ${WGET_LOG_FILE} \
+        1> /dev/null 2>&1; then
+        echo "404 NOTFOUND"
         return 0
-    elif grep "No such file" ${WGET_LOG_FILE} 1> /dev/null 2>&1; then
-        #echo "No such file"
-        return 0
-    else
-        return 1
     fi
+    
+    return 1
 }
 
 # Get package if it is not in the repository
@@ -203,7 +201,8 @@ static_getpkg()
         # so we can safely remove any file prior to trying to download it.
         rm -f ${LFS_PKG_DIR}/${PACK}.${arch_ext}
 
-        rcmd "Fetching ${PACK}.${arch_ext}" ${WGETCMD} ${URL}/${PACK}.${arch_ext}
+        rcmd "Fetching ${PACK}.${arch_ext}" \
+            ${WGETCMD} ${URL}/${PACK}.${arch_ext}
         wget_status=$?
 
         # Append log to global log file