[kernel] r15426 - dists/sid/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Sat Mar 20 15:06:33 2010
New Revision: 15426

Log:
linux-base: Handle duplicates in /etc/udev/rules.d/70-persistent-cd.rules (Closes: #574630)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/linux-base.postinst

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Mar 20 05:50:25 2010	(r15425)
+++ dists/sid/linux-2.6/debian/changelog	Sat Mar 20 15:06:33 2010	(r15426)
@@ -5,6 +5,8 @@
   * [sparc] Provide io{read,write}{16,32}be() (Closes: #574421)
   * Use libata-based drivers for most PATA controllers on all architectures
     (previously applied only to x86)
+  * linux-base: Handle duplicates in /etc/udev/rules.d/70-persistent-cd.rules
+    (Closes: #574630)
 
   [ maximilian attems]
    * [alpha, hppa] Disable oprofile as tracing code is unsupported here.

Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst	Sat Mar 20 05:50:25 2010	(r15425)
+++ dists/sid/linux-2.6/debian/linux-base.postinst	Sat Mar 20 15:06:33 2010	(r15426)
@@ -668,7 +668,8 @@
 		}
 	    } elsif ($path =~ /-scsi-\d+:\d+:\d+:\d+$/) {
 		my $rule_key =  $path . ' ' . $symlink;
-		if (defined(my $j = $wanted_rule{$rule_key})) {
+		my $j = $wanted_rule{$rule_key};
+		if (defined($j) && $j >= 0) {
 		    $unmatched[$j] = undef;
 		}
 		$wanted_rule{$rule_key} = -1;