[pacman-dev] [PATCH 4/6] makepkg: abort when failing to create BUILDDIR

Allan McRae allan at archlinux.org
Fri Mar 9 02:59:07 EST 2012


Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/makepkg.sh.in |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 8dd2d39..9cd8af8 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2052,8 +2052,11 @@ readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
 BUILDDIR=${_BUILDDIR:-$BUILDDIR}
 BUILDDIR=${BUILDDIR:-$startdir} #default to $startdir if undefined
 if [[ ! -d $BUILDDIR ]]; then
-	mkdir -p "$BUILDDIR" ||
-			error "$(gettext "You do not have write permission to create packages in %s.")" "$BUILDDIR"
+	if ! mkdir -p "$BUILDDIR"; then
+		error "$(gettext "You do not have write permission to create packages in %s.")" "$BUILDDIR"
+		plain "$(gettext "Aborting...")"
+		exit 1
+	fi
 	chmod a-s "$BUILDDIR"
 fi
 if [[ ! -w $BUILDDIR ]]; then
-- 
1.7.9.3



More information about the pacman-dev mailing list