From b7c06d6d678ebe6a434b2387c3bda14647113f32 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sat, 4 Feb 2012 09:07:02 -0500 Subject: makepkg.sh.in - if both -r and -i are provided, only remove makedeps Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29ed4f2f..6a1f3141 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2299,7 +2299,7 @@ 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 @@ -2307,6 +2307,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then 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 -- cgit v1.2.3-24-g4f1b