From 300888e05f68c187f74b61f3baebf27e6e2d6acc Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Wed, 15 Jun 2011 04:19:19 -0500 Subject: fullpkg don't fail on update errors libremakepkg only copy log if log exists --- fullpkg | 4 ++-- libremakepkg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fullpkg b/fullpkg index 9dd2ad8..3edc636 100755 --- a/fullpkg +++ b/fullpkg @@ -287,7 +287,7 @@ function _pkg_build () { } msg "Updating pacman db and packages" - sudo pacman -Syu --noconfirm + sudo pacman -Syu --noconfirm || true } echo "built:$(basename $PWD)" >> $build_dir/log @@ -404,7 +404,7 @@ if [ $level -eq 0 ]; then [ $noupdate = 'n' ] && { msg "Updating pacman db and packages" - sudo pacman -Syu --noconfirm + sudo pacman -Syu --noconfirm || true } # Build only diff --git a/libremakepkg b/libremakepkg index af18e8e..58dc352 100755 --- a/libremakepkg +++ b/libremakepkg @@ -89,7 +89,7 @@ msg "Creating the package" makechrootpkg $_CLEAN -r ${CHROOTDIR} -l "${chrootname}" $_PKGINSTALL -- $_MAKEPKG_ARGS ev=$? # exit value -[ $ev -ne 0 -a "$use_log" == 'y' ] && { +[ $ev -ne 0 -a "$use_log" == 'y' -a -e ${CHROOTDIR}/${chrootname}/build/*.log ] && { cp ${CHROOTDIR}/${chrootname}/build/*.log ./ } exit $ev -- cgit v1.2.3-54-g00ecf