Mailinglist Archive: opensuse-commit (705 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package perl-Bootloader
checked in at Mon Jul 3 14:01:32 CEST 2006.

--------
--- perl-Bootloader/perl-Bootloader.changes	2006-06-30 16:07:30.000000000 +0200
+++ perl-Bootloader/perl-Bootloader.changes	2006-07-03 12:31:03.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul  3 12:23:58 CEST 2006 - jplack@xxxxxxx
+
+- fixed severe syntax problems introduced by r113&r111 in Tools.pm
+  and broke update-bootloader
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.1ManQN/_old	2006-07-03 13:59:59.000000000 +0200
+++ /var/tmp/diff_new_pack.1ManQN/_new	2006-07-03 13:59:59.000000000 +0200
@@ -12,7 +12,7 @@
 
 Name:           perl-Bootloader
 Version:        0.2.25
-Release:        1
+Release:        2
 Requires:       perl >= %{perl_version}
 Requires:       perl-gettext
 Autoreqprov:    on
@@ -56,6 +56,9 @@
 /sbin/update-bootloader
 
 %changelog -n perl-Bootloader
+* Mon Jul 03 2006 - jplack@xxxxxxx
+- fixed severe syntax problems introduced by r113&r111 in Tools.pm
+  and broke update-bootloader
 * Wed Jun 28 2006 - jplack@xxxxxxx
 - map kernel_append params to xen_append params (#188614) when
   having a serial console

++++++ perl-Bootloader-0.2.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.25/lib/Bootloader/Tools.pm new/perl-Bootloader-0.2.25/lib/Bootloader/Tools.pm
--- old/perl-Bootloader-0.2.25/lib/Bootloader/Tools.pm	2006-06-12 17:19:01.000000000 +0200
+++ new/perl-Bootloader-0.2.25/lib/Bootloader/Tools.pm	2006-07-03 12:20:13.000000000 +0200
@@ -229,25 +229,26 @@
     #
 
     my @members = ();
-    open (MD, "/sbin/mdadm --detail --verbose --scan") ||
+    open (MD, "/sbin/mdadm --detail --verbose --scan |") ||
         die ("Failed getting information about MD arrays");
     while (my $line = <MD>)
     {
         chomp ($line);
+        my ($array, $level, $num_devices);
 
-        if ($line =~ /ARRAY (\S+) level=(\w+) num-devices=(\d+))
+        if ($line =~ /ARRAY (\S+) level=(\w+) num-devices=(\d+)/)
         {
-            my ($array, $level, $num_devices) = ($1, $2, $3);
+            ($array, $level, $num_devices) = ($1, $2, $3);
         }
-        elsif ($level == "raid1" and $line =~ /devices=(\S+))
+        elsif ($level == "raid1" and $line =~ /devices=(\S+)/)
         {
             # we could test $num_device against number of found devices to
             # detect degradedmode but that does not matter here (really?) 
 
-             $mapping{$array}= split(/,/, $1)
+             $mapping{$array} = split(/,/, $1);
         }
     }
-    close( <MD> );
+    close( MD );
     return \%mapping;
 }
 
@@ -712,7 +713,6 @@
     my $default_section = $glob_ref->{"default"} || "";
     my $default_removed = 0;
 
-    normalize_options(\%option);
     @sections = grep {
 	my $match = $_->{"name"} eq $name;
 	$default_removed = 1



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx