diff options
| author | William Giokas <1007380@gmail.com> | 2013-02-09 12:57:39 -0600 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-02-13 11:50:33 +1000 |
| commit | 42b492b2fd04ed33cfe95a0a3883d78e82ddec90 (patch) | |
| tree | 6199200d89954c047c63ef59cb8a9c7e018ef686 | |
| parent | bafee395a661ae69e2987cf1d84d864013bbbf80 (diff) | |
| download | pacman-42b492b2fd04ed33cfe95a0a3883d78e82ddec90.tar.xz | |
makepkg: fix -r and --needed conflict
In makepkg, passing -sr --needed causes there to be a conflict when
pacman goes to remove the dependencies, as the --needed flag is not an
option for pacman -R. This patch makes --needed not get added to the
PACMAN_OPTS array, but it acts like ASDEPS, and is only added to an
install function.
Signed-off-by: William Giokas <1007380@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e79a468a..293e13f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -54,6 +54,7 @@ readonly -a packaging_options other_options splitpkg_overrides # Options ASDEPS=0 +NEEDED=0 ASROOT=0 CLEANUP=0 DEP_BIN=0 @@ -1985,6 +1986,7 @@ install_package() { local fullver pkgarch pkg pkglist (( ASDEPS )) && pkglist+=('--asdeps') + (( NEEDED )) && pkglist+=('--needed') for pkg in ${pkgname[@]}; do fullver=$(get_full_version $pkg) @@ -2471,7 +2473,7 @@ while true; do # Pacman Options --asdeps) ASDEPS=1;; --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; - --needed) PACMAN_OPTS+=" --needed" ;; + --needed) NEEDED=1;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; # Makepkg Options |