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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 2e56e545804e807b8dd17c631fe84542af9a226f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Mar 30 21:54:30 2009 +0300

    Install yum-arch completion only if yum-arch is installed.

diff --git a/contrib/yum b/contrib/yum
index 66bf529..f718dcd 100644
--- a/contrib/yum
+++ b/contrib/yum
@@ -92,10 +92,12 @@ _yum()
 		;;
 	esac
 }
+} &&
 complete -F _yum $filenames yum
 
 # yum-arch(8) completion
 #
+have yum-arch &&
 _yum_arch()
 {
     local cur
@@ -112,7 +114,5 @@ _yum_arch()
     esac
 
     return 0
-
-}
+} &&
 complete -F _yum_arch $filenames yum-arch
-}
diff --git a/debian/changelog b/debian/changelog
index d5a2bab..afbb037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ bash-completion (1:1.x) UNRELEASED; urgency=low
 
   [ Ville Skyttä ]
   * Split yum and yum-arch completion into contrib/yum.
+  * Install yum-arch completion only if yum-arch is installed.
 
  -- David Paleino <d.paleino at gmail.com>  Wed, 25 Mar 2009 23:18:24 +0100
 

-- 
bash-completion