diff options
| author | Allan McRae <mcrae_allan at hotmail.com> | 2008-04-03 01:07:25 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-05-29 06:37:19 -0500 |
| commit | 9577c07d867eb0887bd524dc1cdaaa188fbe82f3 (patch) | |
| tree | 2e89b3c544a6559382a2d85771fe87756d01f86f | |
| parent | c33cabd6751d1d5903898c911701ce20cf77598d (diff) | |
| download | pacman-9577c07d867eb0887bd524dc1cdaaa188fbe82f3.tar.xz | |
No error in makepkg when removing deps fails
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>
| -rw-r--r-- | scripts/makepkg.sh.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 762ae2be..6479a980 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -415,10 +415,17 @@ remove_deps() { done msg "Removing installed dependencies..." + local ret=0 if [ "$ASROOT" = "0" ]; then - sudo pacman $PACMAN_OPTS -Rns $deplist + sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? 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 } |