diff options
| author | Erich Eckner <git@eckner.net> | 2018-06-08 15:01:24 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-05-15 11:04:49 +0200 |
| commit | 8aa3b68064f9984dbdb35bde46cf13b3ad6e2876 (patch) | |
| tree | afefda6661af8da511b4abacee09747b0d438996 | |
| parent | 0bc687e2e01f4e6e3f2a2f7ac10c7e1fdbaf5ba2 (diff) | |
| download | pacman-8aa3b68064f9984dbdb35bde46cf13b3ad6e2876.tar.xz | |
makepkg: install all dependencies simultanously, if possible
when using rmdeps but not install, runtime dependencies do not
need special handling for (non)removal, and can be installed in the
same transaction. This allows pacman to intelligently resolve some
things which would otherwise be conflicts.
| -rw-r--r-- | scripts/makepkg.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4d9948ec..eb2a19ba 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1398,18 +1398,18 @@ else fi deperr=0 - msg "$(gettext "Checking runtime dependencies...")" - resolve_deps ${depends[@]} || deperr=1 - if (( RMDEPS && INSTALL )); then + msg "$(gettext "Checking runtime dependencies...")" + resolve_deps ${depends[@]} || deperr=1 + original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi msg "$(gettext "Checking buildtime dependencies...")" if (( CHECKFUNC )); then - resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 + resolve_deps "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 else - resolve_deps "${makedepends[@]}" || deperr=1 + resolve_deps "${depends[@]}" "${makedepends[@]}" || deperr=1 fi if (( RMDEPS )); then |