Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-03-09 12:27:09 -0700
committerAaron Griffin <aaronmgriffin@gmail.com>2009-03-09 12:27:09 -0700
commitf7c44611feec38a882d0c5c87717fc9e5c2fd207 (patch)
tree80d53a8081e4f742f4b4cd392b8b6139956aac14
parentb3b1cfba424a4a48818071e267167b54bd4e1687 (diff)
makechrootpkg: remove (pkg|src)dest mount check
This is no longer needed as we don't mount-bind PKGDEST or SRCDEST Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xmakechrootpkg38
1 files changed, 17 insertions, 21 deletions
diff --git a/makechrootpkg b/makechrootpkg
index 7e5d9f6..06e3e74 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -232,29 +232,25 @@ 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}"
- mv "$pkgfile" "${PKGDEST}"
- else
- echo "Moving completed package file to ${WORKDIR}"
- mv "$pkgfile" "${WORKDIR}"
- fi
+ if [ -e "$pkgfile" ]; then
+ if [ -n "$PKGDEST" ]; then
+ echo "Moving completed package file to ${PKGDEST}"
+ mv "$pkgfile" "${PKGDEST}"
+ else
+ echo "Moving completed package file to ${WORKDIR}"
+ mv "$pkgfile" "${WORKDIR}"
fi
fi
- if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
- for f in ${chrootdir}/union/srcdest/*; do
- [ -e "$f" ] || continue
- if [ -n "$SRCDEST" ]; then
- echo "Moving downloaded source file ($(basename $f) to ${SRCDEST}"
- mv "$f" "${SRCDEST}"
- else
- echo "Moving downloaded source file ($(basename $f) to ${WORKDIR}"
- mv "$f" "${WORKDIR}"
- fi
- done
- fi
+ for f in ${chrootdir}/union/srcdest/*; do
+ [ -e "$f" ] || continue
+ if [ -n "$SRCDEST" ]; then
+ echo "Moving downloaded source file ($(basename $f) to ${SRCDEST}"
+ mv "$f" "${SRCDEST}"
+ else
+ echo "Moving downloaded source file ($(basename $f) to ${WORKDIR}"
+ mv "$f" "${WORKDIR}"
+ fi
+ done
else
#just in case. We returned 1, make sure we fail
touch ${chrootdir}/union/build/BUILD_FAILED