moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
William Giokas 2013-02-09 12:57:39 -06:00 committed by Allan McRae
parent bafee395a6
commit 42b492b2fd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/makepkg.sh.in
View File

@ -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