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

2013-04-09 18:23:40 +03:00 · 2013-04-09 18:23:40 +03:00 · 9780b0a044
parent cdd2c3d71d
commit 9780b0a044
4 changed files with 5 additions and 22 deletions
--- 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 \
--- 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()
 {
--- a/test/completion/nmcli.exp
+++ b/test/completion/nmcli.exp
@ -1 +0,0 @@
-assert_source_completions nmcli
--- a/test/lib/completions/nmcli.exp
+++ b/test/lib/completions/nmcli.exp
@ -1,18 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "nmcli "
-sync_after_int
-
-
-teardown