[pacman-dev] [PATCH] makepkg.sh.in - if both -r and -i are provided, only remove makedeps

andrew.gregory.8 at gmail.com andrew.gregory.8 at gmail.com
Sat Feb 4 09:07:02 EST 2012


From: Andrew Gregory <andrew.gregory.8 at gmail.com>

---
 scripts/makepkg.sh.in |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 8274255..91457fd 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2305,13 +2305,17 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then
 		warning "$(gettext "Skipping dependency checks.")"
 	fi
 elif type -p "${PACMAN%% *}" >/dev/null; then
-	if (( RMDEPS )); then
+	if (( RMDEPS && ! INSTALL )); then
 		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
 	fi
 	deperr=0
 
 	msg "$(gettext "Checking runtime dependencies...")"
 	resolve_deps ${depends[@]} || deperr=1
+	
+	if (( RMDEPS && INSTALL )); then
+		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
+	fi
 
 	msg "$(gettext "Checking buildtime dependencies...")"
 	resolve_deps ${makedepends[@]} || deperr=1
-- 
1.7.9



More information about the pacman-dev mailing list