diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-15 04:19:19 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-15 04:19:19 -0500 |
commit | 300888e05f68c187f74b61f3baebf27e6e2d6acc (patch) | |
tree | 5fc8cece069d88feed4dc856316ab750220eea68 | |
parent | 6b008827e1cd2953ca1015a135c8aaf130c7dd27 (diff) |
fullpkg don't fail on update errors
libremakepkg only copy log if log exists
-rwxr-xr-x | fullpkg | 4 | ||||
-rwxr-xr-x | libremakepkg | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 |