From f7c44611feec38a882d0c5c87717fc9e5c2fd207 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 9 Mar 2009 12:27:09 -0700
Subject: 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>
---
 makechrootpkg | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'makechrootpkg')

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
-- 
cgit v1.2.3-24-g4f1b