diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2012-02-04 15:07:02 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-06 12:50:27 +0100 |
| commit | b7c06d6d678ebe6a434b2387c3bda14647113f32 (patch) | |
| tree | b3932f577f60fa2e263b7f6b1f3a533362d7454b | |
| parent | 52afce0a106cac34b4a96cbb6adf6f6bd77b6456 (diff) | |
| download | pacman-b7c06d6d678ebe6a434b2387c3bda14647113f32.tar.gz pacman-b7c06d6d678ebe6a434b2387c3bda14647113f32.tar.xz | |
makepkg.sh.in - if both -r and -i are provided, only remove makedeps
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | 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 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 |