bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: fix abortion after sourcing /etc/profile

Browse source 
The source command triggers / might trigger the ERR trap which makes
makepkg abort right after a successful installation of missing
dependencies.

Thanks to Xavier Chantry <shiningxc@gmail.com> for finding this
solution.

Signed-off-by: Cedric Staniewski <cedric@gmx.ca>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Cedric Staniewski 2009-11-10 20:47:09 +01:00 • committed by Dan McGee
parent 0199a7ee71
commit 77e84bea71
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/makepkg.sh.in
View file

@ -371,10 +371,11 @@ handle_deps() {
fi fi
# we might need the new system environment # we might need the new system environment
# set -e can cause problems during sourcing profile scripts # avoid triggering the ERR trap
set +e local restoretrap=$(trap -p ERR)
trap - ERR
source /etc/profile &>/dev/null source /etc/profile &>/dev/null
set -e eval $restoretrap
return $R_DEPS_SATISFIED return $R_DEPS_SATISFIED
} }