[pacman-dev] [PATCH 4/6] makepkg: abort when failing to create BUILDDIR
Dave Reisner
d at falconindy.com
Fri Mar 9 10:21:49 EST 2012
On Fri, Mar 09, 2012 at 05:59:07PM +1000, Allan McRae wrote:
> 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"
Hrmmm, permissions is only one possible reason for mkdir to fail. the
manpage for the syscall and library wrapper list a bunch more. Since
mkdir will happily report the error for us (with localization), should
we just ditch our own possibly-inaccurate error messaging?
> + 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