diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-23 12:19:51 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-23 12:20:52 -0600 |
| commit | e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03 (patch) | |
| tree | df2e33d95d02b17e5d720320c19e267893d68bdf /contrib | |
| parent | b3612e9cc198f198b3806efa461bf6fc04dd4502 (diff) | |
| parent | 825b4ff35aa676b139dc24bc651724b092f2fded (diff) | |
| download | pacman-e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/diskspace.c
src/pacman/util.h
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bash_completion.in | 4 | ||||
| -rw-r--r-- | contrib/zsh_completion.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index d9f8d826..529734c3 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -59,9 +59,9 @@ _makepkg() { _pacman_pkg() { _arch_compgen "$( if [[ $2 ]]; then - \pacman -$1 | \cut -d' ' -f1 | \sort -u + \pacman -$1 2>/dev/null | \cut -d' ' -f1 | \sort -u else - \pacman -$1 + \pacman -$1 2>/dev/null fi )" } diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f3130867..b30e9600 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -276,7 +276,7 @@ _pacman_completions_repositories() { # $cmd must be declared by calling function _pacman_get_command() { # this is mostly nicked from _perforce - cmd=( "pacman" ) + cmd=( "pacman" "2>/dev/null") integer i for (( i = 2; i < CURRENT - 1; i++ )); do if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then |