Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f344c9e46fa7a26aa60af2316d0b24f5ffe9a293
commit f344c9e46fa7a26aa60af2316d0b24f5ffe9a293 Author: Michel Hermier <[email protected]> Date: Tue Mar 18 09:04:48 2014 +0100 makepkg: Vectorise package removal code. diff --git a/scripts/makepkg b/scripts/makepkg index 8312e1e..0931b41 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -2150,13 +2150,11 @@ if [ "$CLEANUP" = "1" ]; then rm -rf src pkg pkg.* Changelog fi -if [ "$RMDEPS" = "1" -a "`id -u`" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then - msg "Removing installed dependencies..." - makepkg pacman-g2 --sudo -- -R $makedeplist $deplist -elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then - msg "Removing installed dependencies..." - makepkg pacman-g2 --sudo -- -R $makedeplist $deplist -fi + if [ "$RMDEPS" = "1" -a \( -n "$deplist" -o -n "$makedeplist" \) \ + -a \( \( "`id -u`" = "0" -a "$INFAKEROOT" != "1" \) -o "$DEP_SUDO" = "1" \) ]; then + msg "Removing installed dependencies..." + makepkg pacman-g2 --sudo -- -R $makedeplist $deplist + fi msg "Finished making: $pkgname (`date`)" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
