[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.0-141-g48158ee

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 48158ee3e454fe4f6baf30bc59884962aaf3ce8e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Mar 9 10:26:30 2013 +0200

    udevadm: Deprecate ours, one is shipped in systemd >= 196 (RedHat: #919246).

diff --git a/completions/Makefile.am b/completions/Makefile.am
index 8f1276a..a2c7025 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -330,7 +330,6 @@ bashcomp_DATA = a2x \
 		tracepath \
 		tshark \
 		tune2fs \
-		udevadm \
 		umount \
 		umount.linux \
 		unace \
@@ -377,7 +376,7 @@ bashcomp_DATA = a2x \
 		yum-arch
 
 EXTRA_DIST = $(bashcomp_DATA) \
-	     _mock _modules _subversion _yum _yum-utils
+	     _mock _modules _subversion _udevadm _yum _yum-utils
 
 CLEANFILES = \
 	aclocal-1.11 \
diff --git a/completions/udevadm b/completions/_udevadm
similarity index 95%
rename from completions/udevadm
rename to completions/_udevadm
index e8db714..51ec0e5 100644
--- a/completions/udevadm
+++ b/completions/_udevadm
@@ -1,5 +1,8 @@
 # udevadm(8) completion                                    -*- shell-script -*-
 
+# Use of this file is deprecated.  Upstream completion is available in
+# systemd >= 196, use that instead.
+
 _udevadm()
 {
     local cur prev words cword split
diff --git a/test/completion/udevadm.exp b/test/completion/udevadm.exp
deleted file mode 100644
index 69c980f..0000000
--- a/test/completion/udevadm.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions udevadm
diff --git a/test/lib/completions/udevadm.exp b/test/lib/completions/udevadm.exp
deleted file mode 100644
index bef16f0..0000000
--- a/test/lib/completions/udevadm.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "udevadm "
-
-
-sync_after_int
-
-
-teardown

-- 
bash-completion