[kernel] r17785 - dists/trunk/linux-base/debian

[Ben Hutchings]

Author: benh
Date: Mon Jul  4 03:55:01 2011
New Revision: 17785

Log:
debian/postinst: Fix 'uninitialized value in string eq' (Closes: #620608)

This warning was produced when checking a device that does not exist
or has no recognisable filesystem.  We need to check whether the
filesystem type is defined before checking for any specific type.

Modified:
   dists/trunk/linux-base/debian/changelog
   dists/trunk/linux-base/debian/postinst

Modified: dists/trunk/linux-base/debian/changelog
==============================================================================
--- dists/trunk/linux-base/debian/changelog	Mon Jul  4 03:30:40 2011	(r17784)
+++ dists/trunk/linux-base/debian/changelog	Mon Jul  4 03:55:01 2011	(r17785)
@@ -4,6 +4,8 @@
   * Add Slovak debconf template translation (Slavko) (Closes: #622118)
   * linux-version: Fix interpolation of command name in help, thanks to
     Jakub Wilk (Closes: #624795)
+  * debian/postinst: Fix warning produced when checking a device that
+    does not exist or has no recognisable filesystem (Closes: #620608)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 03 Apr 2011 02:58:29 +0100
 

Modified: dists/trunk/linux-base/debian/postinst
==============================================================================
--- dists/trunk/linux-base/debian/postinst	Mon Jul  4 03:30:40 2011	(r17784)
+++ dists/trunk/linux-base/debian/postinst	Mon Jul  4 03:55:01 2011	(r17785)
@@ -1280,7 +1280,8 @@
     # Sort each device's IDs in reverse lexical order so that UUIDs are
     # preferred.
     for my $bdev (keys(%bdev_map)) {
-	if ($bdev_map{$bdev}->{type} eq 'LVM2_member') {
+	if (!defined($bdev_map{$bdev}->{type}) ||
+	    $bdev_map{$bdev}->{type} eq 'LVM2_member') {
 	    @{$bdev_map{$bdev}->{ids}} = ();
 	} else {
 	    @{$bdev_map{$bdev}->{ids}} =