diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-03-16 22:23:47 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-03-17 21:00:09 -0500 |
| commit | 73ab153c44a1581b4bcf1e64eb6042b0631c2e66 (patch) | |
| tree | 5e152181a43ea6848215232b76c18f8e9e763f1c | |
| parent | b3e6cf652c9e989badaf5499abb1d64c1a110927 (diff) | |
| download | pacman-73ab153c44a1581b4bcf1e64eb6042b0631c2e66.tar.xz | |
Kill some obsolete references to -A option.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
| -rw-r--r-- | contrib/bash_completion | 8 | ||||
| -rw-r--r-- | contrib/zsh_completion | 11 | ||||
| -rw-r--r-- | lib/libalpm/add.c | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/contrib/bash_completion b/contrib/bash_completion index 7f5d1b08..bfe33908 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -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 diff --git a/contrib/zsh_completion b/contrib/zsh_completion index e5ad92b7..eeef7d5f 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -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[@]" \ diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 4d8e1a03..5dcc0587 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -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); |