mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-11 20:05:07 -05:00
Kill some obsolete references to -A option.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
parent
b3e6cf652c
commit
73ab153c44
@ -146,14 +146,13 @@ _pacman ()
|
||||
toparse="${a:2}"
|
||||
|
||||
case "${arg}" in
|
||||
-@(A|U|R|S|Q|h|V))
|
||||
-@(U|R|S|Q|h|V))
|
||||
op="${arg/-}"
|
||||
mod="${mod}${a:2}"
|
||||
;;
|
||||
--)
|
||||
arg="${a:2}"
|
||||
case "${arg}" in
|
||||
add) op="A" ;;
|
||||
remove) op="R" ;;
|
||||
upgrade) op="U" ;;
|
||||
query) op="Q" ;;
|
||||
@ -203,7 +202,6 @@ _pacman ()
|
||||
|
||||
if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then
|
||||
COMPREPLY=( $( compgen -W '\
|
||||
-A --add \
|
||||
-h --help \
|
||||
-Q --query \
|
||||
-R --remove \
|
||||
@ -217,7 +215,7 @@ _pacman ()
|
||||
|
||||
if [[ "$cur" == -* ]]; then
|
||||
case "${op}" in
|
||||
A|U)
|
||||
U)
|
||||
COMPREPLY=( $( compgen -W '\
|
||||
--asdeps \
|
||||
--asexplicit \
|
||||
@ -320,7 +318,7 @@ _pacman ()
|
||||
rem_selected
|
||||
else
|
||||
case "${op}" in
|
||||
A|U)
|
||||
U)
|
||||
COMPREPLY=( $( compgen -d -- "$cur" ) \
|
||||
$( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
|
||||
return 0
|
||||
|
@ -6,7 +6,6 @@ typeset -A opt_args
|
||||
|
||||
# options for passing to _arguments: main pacman commands
|
||||
_pacman_opts_commands=(
|
||||
'-A[Add a package to the system]'
|
||||
'-Q[Query the package database]'
|
||||
'-R[Remove a package from the system]'
|
||||
'-S[Synchronize packages]'
|
||||
@ -29,7 +28,7 @@ _pacman_opts_common=(
|
||||
'--noscriptlet[Do not execute the install scriptlet if one exists]'
|
||||
)
|
||||
|
||||
# options for passing to _arguments: options for --add and --update commands
|
||||
# options for passing to _arguments: options for --upgrade commands
|
||||
_pacman_opts_pkgfile=(
|
||||
'-d[Skip dependency checks]'
|
||||
'-f[Overwrite conflicting files]'
|
||||
@ -94,13 +93,6 @@ _pacman_opts_sync_modifiers=(
|
||||
'--asexplicit[Install packages as explicitly installed]'
|
||||
)
|
||||
|
||||
# handles --action subcommand
|
||||
_pacman_action_add() {
|
||||
_arguments -s : \
|
||||
"$_pacman_opts_common[@]" \
|
||||
"$_pacman_opts_pkgfile[@]"
|
||||
}
|
||||
|
||||
# handles --help subcommand
|
||||
_pacman_action_help() {
|
||||
_arguments -s : \
|
||||
@ -291,7 +283,6 @@ _pacman_get_command() {
|
||||
# main dispatcher
|
||||
_pacman() {
|
||||
case $words[2] in
|
||||
-A*) _pacman_action_add ;;
|
||||
-Q*g*) # ipkg groups
|
||||
_arguments -s : \
|
||||
"$_pacman_opts_common[@]" \
|
||||
|
@ -160,7 +160,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
|
||||
_alpm_log(PM_LOG_ERROR, _("you cannot install two conflicting packages at the same time\n"));
|
||||
}
|
||||
if(outer) {
|
||||
_alpm_log(PM_LOG_ERROR, _("replacing packages with -A and -U is not supported yet\n"));
|
||||
_alpm_log(PM_LOG_ERROR, _("replacing packages with -U is not supported yet\n"));
|
||||
_alpm_log(PM_LOG_ERROR, _("you can replace packages manually using -Rd and -U\n"));
|
||||
}
|
||||
RET_ERR(PM_ERR_CONFLICTING_DEPS, -1);
|
||||
|
Loading…
Reference in New Issue
Block a user