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

No error in makepkg when removing deps fails

Browse source 
Catches error from when pacman is unable to remove dependencies after
successfully building package and prints warning.  Fixes FS#10039.

Signed-off-by: Allan McRae <mcrae_allan at hotmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2008-04-03 01:07:25 +10:00 • committed by Dan McGee
parent c33cabd675
commit 9577c07d86
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/makepkg.sh.in
View file

@ -415,10 +415,17 @@ remove_deps() {
done done
msg "Removing installed dependencies..." msg "Removing installed dependencies..."
local ret=0
if [ "$ASROOT" = "0" ]; then if [ "$ASROOT" = "0" ]; then
sudo pacman $PACMAN_OPTS -Rns $deplist sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$?
else else
pacman $PACMAN_OPTS -Rns $deplist pacman $PACMAN_OPTS -Rns $deplist || ret=$?
fi
# Fixes FS#10039 - exit cleanly as package has built successfully
if [ $ret -ne 0 ]; then
warning "$(gettext "Failed to remove installed dependencies.")"
return 0
fi fi
} }