about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2010-04-25 22:39:09 +0000
committerClint Adams <clint@users.sourceforge.net>2010-04-25 22:39:09 +0000
commit9b8e49a7b13a6a233c746715907ac4efa14c22a0 (patch)
tree2e71295083cb40d47d8e3c05b58c6c1cf830c8f4
parent9cd312ff0fdc34f802802c1bae42cb256b9317b3 (diff)
downloadzsh-9b8e49a7b13a6a233c746715907ac4efa14c22a0.tar.gz
zsh-9b8e49a7b13a6a233c746715907ac4efa14c22a0.tar.xz
zsh-9b8e49a7b13a6a233c746715907ac4efa14c22a0.zip
27914: find usb.ids in /usr/share/misc.
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Linux/Command/_lsusb2
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cfd367ca7..b82d56e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2010-04-25  Clint Adams  <clint@zsh.org>
 
 	* 27912: Completion/Linux/Command/_lsusb: presume that
-	pci.ids is uncompressed now.
+	usb.ids is uncompressed now.
+
+	* 27914: Completion/Linux/Command/_lsusb: find usb.ids
+	in /usr/share/misc.
 
 2010-04-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
@@ -13057,5 +13060,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4962 $
+* $Revision: 1.4963 $
 *****************************************************
diff --git a/Completion/Linux/Command/_lsusb b/Completion/Linux/Command/_lsusb
index 17d88d4b5..a2aaa4e62 100644
--- a/Completion/Linux/Command/_lsusb
+++ b/Completion/Linux/Command/_lsusb
@@ -25,7 +25,7 @@ _arguments \
         _lsusb_devices[${pair}]="$match[2]"
       ;;
     esac
-  done < /var/lib/usbutils/usb.ids
+  done < /usr/share/misc/pci.ids
 fi
 
 compadd -k _lsusb_devices