X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Ffpkg;h=b5c06c66fc11f4e448f19caa0d1c868983afaa3d;hb=6890ab467c34bc0ae1fccf18a521c3cedfa442a2;hp=dfbafae4e5305c11de1e2728b337ec45351802ab;hpb=14ad1e23484d4394eea4a8d0386995190a05039d;p=hvlinux.git diff --git a/functions/fpkg b/functions/fpkg index dfbafae..b5c06c6 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -90,6 +90,7 @@ wget_wrapper() local URL=${1} local SOURCE=${2} local DESTDIR=${LFS_PKG_DIR} + local wget_status if [ ${#} -eq 3 ]; then DESTDIR=${3} @@ -154,17 +155,24 @@ wget_wrapper() # Arg. #2: Destination filename. static_fetch_patches_list() { + local wget_status + PATCHES_URL=${1} PATCHES_LIST_FILENAME=${2} # Appending a slash (/) will download the directory content as a file named # index.html - ${WGETCMD} "${PATCHES_URL}/" && + ${WGETCMD} "${PATCHES_URL}/" + wget_status=$? # Append log to global log file - cat ${WGET_LOG_FILE} >> ${LFS_LOG_FILE} && + cat ${WGET_LOG_FILE} >> ${LFS_LOG_FILE} - mv ${LFS_PKG_DIR}/index.html ${PATCHES_LIST_FILENAME} + if [ ${wget_status} -eq 0 ]; then + mv ${LFS_PKG_DIR}/index.html ${PATCHES_LIST_FILENAME} + else + return 1 + fi } # Arg. #1: If "test" is specified, set TEST_INTEGRITY to 1 @@ -210,20 +218,26 @@ update_packages_init() if [ -n "${USE_LFS_PATCHES}" ]; then # Getting list of all patches from LFS server. - rcmd "Fetching LFS patches list" static_fetch_patches_list \ + set +e + rcmd "Fetching LFS patches list" static_fetch_patches_list \ ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} + set -e fi 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 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 } @@ -237,6 +251,11 @@ static_checkpatch() local PATCHES_LIST=${2} local PATCHES_URL=${3} + # Make sure patch list file exists + if [ ! -f ${PATCHES_LIST} ]; then + return + fi + # Remplace les "+" par "%2B" local PACK_URL=$(echo $PACK | sed s!\+!%2B!g)