moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

makepkg: catch errors sourcing files

Browse Source 
create source_safe() function which temporarily disables extglob and
exits on error.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
Dave Reisner 2012-02-10 15:10:32 -05:00 committed by Dan McGee
parent dca10b062f
commit 8fe6791928
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/makepkg.sh.in
View File

@ -873,6 +873,15 @@ cd_safe() {
fi fi
} }
source_safe() {
shopt -u extglob
if ! source "$@"; then
error "$(gettext "Failed to source %s")" "$1"
exit 1
fi
shopt -s extglob
}
run_function_safe() { run_function_safe() {
local restoretrap local restoretrap
@ -1816,7 +1825,7 @@ devel_update() {
if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then
@SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE"
@SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE"
source "$BUILDFILE" source_safe "$BUILDFILE"
fi fi
fi fi
fi fi
@ -2026,7 +2035,7 @@ MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf}
# Source the config file; fail if it is not found # Source the config file; fail if it is not found
if [[ -r $MAKEPKG_CONF ]]; then if [[ -r $MAKEPKG_CONF ]]; then
source "$MAKEPKG_CONF" source_safe "$MAKEPKG_CONF"
else else
error "$(gettext "%s not found.")" "$MAKEPKG_CONF" error "$(gettext "%s not found.")" "$MAKEPKG_CONF"
plain "$(gettext "Aborting...")" plain "$(gettext "Aborting...")"
@ -2036,7 +2045,7 @@ fi
# Source user-specific makepkg.conf overrides, but only if no override config # Source user-specific makepkg.conf overrides, but only if no override config
# file was specified # file was specified
if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then
source ~/.makepkg.conf source_safe ~/.makepkg.conf
fi fi
# set pacman command if not already defined # set pacman command if not already defined
@ -2153,9 +2162,7 @@ if [[ ! -f $BUILDFILE ]]; then
else else
# PKGBUILD passed through a pipe # PKGBUILD passed through a pipe
BUILDFILE=/dev/stdin BUILDFILE=/dev/stdin
shopt -u extglob source_safe "$BUILDFILE"
source "$BUILDFILE"
shopt -s extglob
fi fi
else else
crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true)
@ -2167,9 +2174,7 @@ else
if [[ ${BUILDFILE:0:1} != "/" ]]; then if [[ ${BUILDFILE:0:1} != "/" ]]; then
BUILDFILE="$startdir/$BUILDFILE" BUILDFILE="$startdir/$BUILDFILE"
fi fi
shopt -u extglob source_safe "$BUILDFILE"
source "$BUILDFILE"
shopt -s extglob
fi fi
# set defaults if they weren't specified in buildfile # set defaults if they weren't specified in buildfile