[Bash-completion-devel] Ubuntu bash-completion 20080705ubuntu2

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Wed, 21 Jan 2009 18:33:06 +0000
Source: bash-completion
Binary: bash-completion
Architecture: source
Version: 20080705ubuntu2
Distribution: jaunty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson at ubuntu.com>
Description: 
 bash-completion - programmable completion for the bash shell
Launchpad-Bugs-Fixed: 316654
Changes: 
 bash-completion (20080705ubuntu2) jaunty; urgency=low
 .
   * modprobe: Check for */* before checking for 'modprobe -r', to avoid
     spewing an awk syntax error (thanks, Martin Mai; LP: #316654).
Files: 
 47e610e979e8fad13f7fb7b28c524bc2 1115 shells standard bash-completion_20080705ubuntu2.dsc
 71fb63478081fa628c0e45789fb8fcb6 103272 shells standard bash-completion_20080705ubuntu2.tar.gz
Original-Maintainer: Bash Completion Maintainers <bash-completion-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 20080705ubuntu1/bash_completion 20080705ubuntu2/bash_completion
--- 20080705ubuntu1/bash_completion	2009-01-08 11:22:01.000000000 +0000
+++ 20080705ubuntu2/bash_completion	2009-01-21 18:15:40.000000000 +0000
@@ -794,6 +794,12 @@ _insmod()
 	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
+	# do filename completion if we're giving a path to a module
+	if [[ "$cur" == */* ]]; then
+		_filedir '@(?(k)o?(.gz))'
+		return 0
+	fi
+
 	# behave like lsmod for modprobe -r
 	if [ $1 = "modprobe" ] &&
 	   [ "${COMP_WORDS[1]}" = "-r" ]; then
@@ -802,12 +808,6 @@ _insmod()
 		return 0
 	fi
 
-	# do filename completion if we're giving a path to a module
-	if [[ "$cur" == */* ]]; then
-		_filedir '@(?(k)o?(.gz))'
-		return 0
-	fi
-
 	if [ $COMP_CWORD -gt 1 ] &&
 	   [[ "${COMP_WORDS[COMP_CWORD-1]}" != -* ]]; then
 		# do module parameter completion
diff -pruN 20080705ubuntu1/debian/changelog 20080705ubuntu2/debian/changelog
--- 20080705ubuntu1/debian/changelog	2009-01-08 11:22:01.000000000 +0000
+++ 20080705ubuntu2/debian/changelog	2009-01-21 18:33:07.000000000 +0000
@@ -1,3 +1,10 @@
+bash-completion (20080705ubuntu2) jaunty; urgency=low
+
+  * modprobe: Check for */* before checking for 'modprobe -r', to avoid
+    spewing an awk syntax error (thanks, Martin Mai; LP: #316654).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Wed, 21 Jan 2009 18:33:06 +0000
+
 bash-completion (20080705ubuntu1) jaunty; urgency=low
 
   * Merge from Debian, remaining changes: (LP: #314806)
diff -pruN 20080705ubuntu1/debian/control 20080705ubuntu2/debian/control
--- 20080705ubuntu1/debian/control	2009-01-08 11:22:01.000000000 +0000
+++ 20080705ubuntu2/debian/control	2009-01-21 18:32:38.000000000 +0000
@@ -6,6 +6,7 @@ XSBC-Original-Maintainer: Bash Completio
 Uploaders: Luk Claes <luk at debian.org>, David Paleino <d.paleino at gmail.com>
 Build-Depends: debhelper (>= 6), perl
 Standards-Version: 3.8.0
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/bash-completion/ubuntu
 
 Package: bash-completion
 Architecture: all