[kernel] r18028 - in dists/sid/linux-2.6/debian: . templates/image.plain.bug

[Ben Hutchings]

Author: benh
Date: Sun Aug 28 16:10:03 2011
New Revision: 18028

Log:
Make bug script accept failure of lspci (Closes: #639439)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/templates/image.plain.bug/include-pci

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Aug 28 15:55:07 2011	(r18027)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 28 16:10:03 2011	(r18028)
@@ -1,3 +1,10 @@
+linux-2.6 (3.0.0-4) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Make bug script accept failure of lspci (Closes: #639439)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Aug 2011 17:07:47 +0100
+
 linux-2.6 (3.0.0-3) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/sid/linux-2.6/debian/templates/image.plain.bug/include-pci
==============================================================================
--- dists/sid/linux-2.6/debian/templates/image.plain.bug/include-pci	Sun Aug 28 15:55:07 2011	(r18027)
+++ dists/sid/linux-2.6/debian/templates/image.plain.bug/include-pci	Sun Aug 28 16:10:03 2011	(r18028)
@@ -1,10 +1,6 @@
 add_pci() {
   echo '** PCI devices:' >&3
-  if command -v lspci > /dev/null; then
-    lspci -nnvv >&3
-  else
-    echo 'not available' >&3
-  fi
+  lspci -nnvv >&3 2>/dev/null || echo 'not available' >&3
   echo >&3
 }