[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2888874fa9c6e117c867cb0dd7b1792b6df391e6

Ville Skyttä ville.skytta at iki.fi
Wed Nov 18 21:34:28 UTC 2009


The following commit has been merged in the master branch:
commit 2888874fa9c6e117c867cb0dd7b1792b6df391e6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Nov 18 23:33:06 2009 +0200

    Testsuite: don't use pidof to check if avahi-daemon is running, cf. commit bb8912b06ff09f8fed253e7e5b14916e38a48733.

diff --git a/test/lib/library.exp b/test/lib/library.exp
index 5194191..7319793 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -380,8 +380,8 @@ proc get_hosts {} {
 proc get_hosts_avahi {} {
         # Retrieving hosts is successful?
     if { [catch {exec bash -c {
-        type avahi-browse >&/dev/null && [ -n "$(pidof avahi-daemon)" ] \
-            && avahi-browse -cpr _workstation._tcp | grep ^= | cut -d\; -f7 | sort -u
+        type avahi-browse >&/dev/null && \
+            && avahi-browse -cpr _workstation._tcp 2>/dev/null | grep ^= | cut -d\; -f7 | sort -u
     }} hosts] } {
         # No, retrieving hosts yields error;
             # Reset hosts

-- 
bash-completion



More information about the Bash-completion-commits mailing list