[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.1-10-g9780b0a

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 9780b0a04472187cb4ac4557e21038caac31fd86
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Apr 9 18:23:40 2013 +0300

    nmcli: Deprecate our completion, upstream has one in 0.9.8.0.

diff --git a/completions/Makefile.am b/completions/Makefile.am
index 4eda2fd..0e604f0 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -230,7 +230,6 @@ bashcomp_DATA = a2x \
 		newusers \
 		ngrep \
 		nmap \
-		nmcli \
 		nslookup \
 		ntpdate \
 		openssl \
@@ -380,7 +379,7 @@ bashcomp_DATA = a2x \
 		yum-arch
 
 EXTRA_DIST = $(bashcomp_DATA) \
-	     _mock _modules _subversion _udevadm _yum _yum-utils
+	     _mock _modules _nmcli _subversion _udevadm _yum _yum-utils
 
 CLEANFILES = \
 	aclocal-1.10 \
diff --git a/completions/nmcli b/completions/_nmcli
similarity index 96%
rename from completions/nmcli
rename to completions/_nmcli
index 00628b4..81e0662 100644
--- a/completions/nmcli
+++ b/completions/_nmcli
@@ -1,4 +1,7 @@
-# nmcli completion                                           -*- shell-script -*-
+# nmcli completion                                         -*- shell-script -*-
+
+# Use of this file is deprecated.  Upstream completion is available in
+# NetworkManager >= 0.9.8.0, use that instead.
 
 _nmcli_list()
 {
diff --git a/test/completion/nmcli.exp b/test/completion/nmcli.exp
deleted file mode 100644
index 816468f..0000000
--- a/test/completion/nmcli.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions nmcli
diff --git a/test/lib/completions/nmcli.exp b/test/lib/completions/nmcli.exp
deleted file mode 100644
index b891f45..0000000
--- a/test/lib/completions/nmcli.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "nmcli "
-sync_after_int
-
-
-teardown

-- 
bash-completion