On Mon, 13 Aug 2018 21:20:58 -0400, Eli Schwartz wrote:

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bb24c633..1ab2ea3c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -188,6 +188,9 @@ enter_fakeroot() { # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver update_pkgver() { newpkgver=$(run_function_safe pkgver) + if (( $? != 0 )); then + error_function pkgver + fi

Why bring $? in to it, why not: if ! newpkgver=$(run_function_safe pkgver); then error_function pkgver fi -- Happy hacking, ~ Luke Shumaker

On 14/08/18 11:20, Eli Schwartz wrote:

`run_function_safe pkgver` is evaluated in a subshell and therefore does not abort when it should. Explicitly check the return outside of the subshell and abort if necessary.

Signed-off-by: Eli Schwartz --- scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bb24c633..1ab2ea3c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -188,6 +188,9 @@ enter_fakeroot() { # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver update_pkgver() { newpkgver=$(run_function_safe pkgver) + if (( $? != 0 )); then + error_function pkgver + fi if ! check_pkgver "$newpkgver"; then error "$(gettext "pkgver() generated an invalid version: %s")" "$newpkgver" exit $E_PKGBUILD_ERROR

OK. Also, this looks like another reason to special case running pkgver() which would allow us to cature its output only. A

On 8/29/18 12:54 AM, Allan McRae wrote:

On 14/08/18 11:20, Eli Schwartz wrote:

...

Signed-off-by: Eli Schwartz --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4024f477..bb8332c6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -418,13 +418,14 @@ prepare_buildenv() { }

run_function_safe() { - local restoretrap restoreset restoreshopt + local restoretrap restoreshopt

# we don't set any special shopts of our own, but we don't want the user to # muck with our environment. restoreshopt=$(shopt -p)

- restoreset=$(shopt -o -p) + # localize sets, sadly this does not work for shopt + local -

My understanding is this does not quite do the same thing... "local -" only save the single-letter shell options. There are set options that do not have a single letter variants (although they are unlikely to be used...).

The manpage does not indicate this; it just says: the set of shell options is made local to the function in which local is invoked: shell options changed using the set builtin inside the function are restored to their original values when the function returns. So... $ testfunc() { shopt -p -o pipefail; local -; set -o pipefail; shopt -p -o pipefail; } $ testfunc; shopt -p -o pipefail set +o pipefail set -o pipefail set +o pipefail Seems to work okay, fortunately. -- Eli Schwartz Bug Wrangler and Trusted User