X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Ffpkg;h=133b12372e7103f58e99a74ecf7fa87db85a7ef1;hb=10a9a4a4045ee1e6bc30df5de9bb857d1fd0dc1f;hp=eedc14dc18192ad43f067d1f63b7ca658d6476d2;hpb=769abe2665103a85d34685c3e1fff5d04480c47a;p=hvlinux.git diff --git a/functions/fpkg b/functions/fpkg index eedc14d..133b123 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} @@ -215,23 +216,23 @@ update_packages_init() return 1 fi - if [ -n "${USE_LFS_PATCHES}" ]; then - # Getting list of all patches from LFS server. - rcmd "Fetching LFS patches list" static_fetch_patches_list \ - ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} - fi + # Temporary deactivate error checking. + set +e - if [ -n "${USE_BLFS_PATCHES}" ]; then - # Getting list of all patches from BLFS server. - rcmd "Fetching BLFS patches list" static_fetch_patches_list \ - ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST} - fi + # Getting list of all patches from LFS server. + rcmd "Fetching LFS patches list" static_fetch_patches_list \ + ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} - if [ -n "${USE_CLFS_PATCHES}" ]; then - # Getting list of all patches from CLFS server. - rcmd "Fetching CLFS patches list" static_fetch_patches_list \ - ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST} - fi + # Getting list of all patches from BLFS server. + rcmd "Fetching BLFS patches list" static_fetch_patches_list \ + ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST} + + # Getting list of all patches from CLFS server. + rcmd "Fetching CLFS patches list" static_fetch_patches_list \ + ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST} + + # Reactivate error checking. + set -e } # Get patch for package if it is not in the repository @@ -288,20 +289,14 @@ static_getpatch() return 1 fi - if [ -n "${USE_LFS_PATCHES}" ]; then - # Checking if patch is available from LFS. - static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL} - fi + # Checking if patch is available from LFS. + static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL} - if [ -n "${USE_BLFS_PATCHES}" ]; then - # Checking if patch is available from BLFS. - static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL} - fi + # Checking if patch is available from BLFS. + static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL} - if [ -n "${USE_CLFS_PATCHES}" ]; then - # Checking if patch is available from CLFS. - static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL} - fi + # Checking if patch is available from CLFS. + static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL} } detect_file_not_found()