From 42b492b2fd04ed33cfe95a0a3883d78e82ddec90 Mon Sep 17 00:00:00 2001 From: William Giokas <1007380@gmail.com> Date: Sat, 9 Feb 2013 12:57:39 -0600 Subject: 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 --- scripts/makepkg.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3-70-g09d2