[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1ab50e301ea26d8fba3e82f2a986f84f61d8a218

[David Paleino]

The following commit has been merged in the master branch:
commit 1ab50e301ea26d8fba3e82f2a986f84f61d8a218
Merge: 1e532f0f2b87a07277c39ed3f68ea134d0393c4d c769eeaf8c1331536427cc98104ef460461b16e6
Author: David Paleino <d.paleino at gmail.com>
Date:   Sat Jun 20 09:14:35 2009 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/bash-completion/bash-completion

diff --combined bash_completion
index bdf01a3,0b40247..e56b871
--- a/bash_completion
+++ b/bash_completion
@@@ -1084,6 -1084,8 +1084,8 @@@ _known_hosts_real(
  			p) prefix=$OPTARG ;;
  		esac
  	done
+ 	[ $# -ge $OPTIND ] && echo "error: $FUNCNAME("$@"): unprocessed arguments:"\
+ 	    $(while [ $# -gt 0 ]; do echo ${!OPTIND}; shift; done)
  
  	[[ $cur == *@* ]] && user=${cur%@*}@ && cur=${cur#*@}
  	kh=()
@@@ -1193,13 -1195,10 +1195,13 @@@
  	    fi
  
          # Add hosts reported by avahi, if it's available
 +        # and if the daemon is started.
          if type avahi-browse >&/dev/null; then
 -        COMPREPLY=( "${COMPREPLY[@]}" $(
 -            compgen -W "$( avahi-browse -kcpr _workstation._tcp | \
 -                           grep ^= | cut -d\; -f7 | sort -u )" -- $cur ) )
 +            if [ -z "$(pidof avahi-daemon)" ]; then
 +                COMPREPLY=( "${COMPREPLY[@]}" $(
 +                    compgen -W "$( avahi-browse -kcpr _workstation._tcp | \
 +                                   grep ^= | cut -d\; -f7 | sort -u )" -- $cur ) )
 +            fi
          fi
  
  	    # Now add results of normal hostname completion

-- 
bash-completion