X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Ffpkg;h=133b12372e7103f58e99a74ecf7fa87db85a7ef1;hb=91225b782d7c0309719e45df4c603e52d28d96d3;hp=b5c06c66fc11f4e448f19caa0d1c868983afaa3d;hpb=3440e7ecb9372af0e045506632efd7d953a1975f;p=hvlinux.git diff --git a/functions/fpkg b/functions/fpkg index b5c06c6..133b123 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -216,29 +216,23 @@ update_packages_init() return 1 fi - if [ -n "${USE_LFS_PATCHES}" ]; then - # Getting list of all patches from LFS server. - set +e - rcmd "Fetching LFS patches list" static_fetch_patches_list \ - ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} - set -e - fi + # Temporary deactivate error checking. + set +e - 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 + # 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. - set +e - rcmd "Fetching CLFS patches list" static_fetch_patches_list \ - ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST} - set -e - 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 @@ -295,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()