Commit f7c44611 authored by Aaron Griffin's avatar Aaron Griffin
Browse files

makechrootpkg: remove (pkg|src)dest mount check 



This is no longer needed as we don't mount-bind PKGDEST or SRCDEST

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

makechrootpkg

+17 −21
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then 
    fi



    local pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz

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

    if [ -e "$pkgfile" ]; then

        if [ -n "$PKGDEST" ]; then

            echo "Moving completed package file to ${PKGDEST}"
@@ -242,8 +241,6 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then 
            mv "$pkgfile" "${WORKDIR}"

        fi

    fi

    fi

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

    for f in ${chrootdir}/union/srcdest/*; do

        [ -e "$f" ] || continue

        if [ -n "$SRCDEST" ]; then
@@ -254,7 +251,6 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then 
            mv "$f" "${WORKDIR}"

        fi

    done

    fi

else

    #just in case. We returned 1, make sure we fail

    touch ${chrootdir}/union/build/BUILD_FAILED