makepkg: don't save the same shopts twice
Both run_function and run_function_safe will save and restore `shopt -p` but the former is only called from the latter. It makes sense to save this as part of a "safe" runner, so let's just do it in one place, there where we save and restore everything else too. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
0696307a3b
commit
48c8f9f2a2
1 changed files with 0 additions and 5 deletions
|
@ -447,9 +447,6 @@ run_function() {
|
|||
msg "$(gettext "Starting %s()...")" "$pkgfunc"
|
||||
cd_safe "$srcdir"
|
||||
|
||||
# save our shell options so pkgfunc() can't override what we need
|
||||
local shellopts=$(shopt -p)
|
||||
|
||||
local ret=0
|
||||
if (( LOGGING )); then
|
||||
local fullver=$(get_full_version)
|
||||
|
@ -479,8 +476,6 @@ run_function() {
|
|||
else
|
||||
"$pkgfunc"
|
||||
fi
|
||||
# reset our shell options
|
||||
eval "$shellopts"
|
||||
}
|
||||
|
||||
run_prepare() {
|
||||
|
|
Loading…
Add table
Reference in a new issue