Commit 17ecb862 authored by Aaron Griffin's avatar Aaron Griffin
Browse files

makechrootpkg: Always attempt to move pkg/src 



Sometimes makepkg fails, but a package is built - for
instance, when makepkg cannot remove deps. In this case we
will attempt to move the pkg/src files regardless.

Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent 6805bc54

makechrootpkg

+13 −12
Original line number Diff line number Diff line
@@ -193,11 +193,6 @@ chmod +x "$uniondir/chrootbuild" 


mkarchroot -r "/chrootbuild" "$uniondir"



if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then

    echo "Build failed, check \$CHROOT_DIR/rw/build"

    rm ${chrootdir}/rw/build/BUILD_FAILED

    exit 1

else	

source ${WORKDIR}/PKGBUILD

if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then

    echo "Moving completed package file to ${WORKDIR}"
@@ -207,8 +202,14 @@ else 
    echo "Moving downloaded source files to ${WORKDIR}"

    mv ${chrootdir}/union/srcdest/* ${WORKDIR}

fi



if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then

    echo "Build failed, check \$CHROOT_DIR/rw/build"

    rm ${chrootdir}/rw/build/BUILD_FAILED

else

    rm -rf ${chrootdir}/rw/build/*

    echo "Build complete"

fi	





# vim:ft=sh:ts=4:sw=4:et: