commit perl-Bootloader

19 May 2006

Hello community,

here is the log from the commit of package perl-Bootloader
checked in at Fri May 19 16:53:39 CEST 2006.

--------

--- perl-Bootloader/perl-Bootloader.changes	2006-05-10 16:01:53.000000000 +0200
+++ perl-Bootloader/perl-Bootloader.changes	2006-05-19 16:12:53.000000000 +0200
@@ -1,0 +2,23 @@
+Fri May 19 15:47:45 CEST 2006 - jplack@suse.de
+
+- fix xen section counting when adding (#161559)
+- omit bogus warning (#165158)
+- move check for bool type to save code area (#175228)
+- do syntax checking for global "default" parameter. Has to be an
+  integer (#174829)
+- bump version to 0.2.23
+
+-------------------------------------------------------------------
+Fri May 12 15:56:05 CEST 2006 - jplack@suse.de
+
+- do not accept empty product string
+
+-------------------------------------------------------------------
+Fri May 12 14:22:12 CEST 2006 - jplack@suse.de
+
+- call setlocale only when neccessary (helps with --refresh in
+  instsys)
+- do not define opt_xen_kernel initially hence else all new entries
+  will be xen entries.
+
+-------------------------------------------------------------------

Old:
----
  perl-Bootloader-0.2.22.tar.bz2

New:
----
  perl-Bootloader-0.2.23.tar.bz2

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

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.jRTdKf/_old	2006-05-19 16:53:35.000000000 +0200
+++ /var/tmp/diff_new_pack.jRTdKf/_new	2006-05-19 16:53:35.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.2.22)
+# spec file for package perl-Bootloader (Version 0.2.23)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,8 +11,8 @@
 # norootforbuild
 
 Name:           perl-Bootloader
-Version:        0.2.22
-Release:        2
+Version:        0.2.23
+Release:        1
 Requires:       perl >= %{perl_version}
 Requires:       perl-gettext
 Autoreqprov:    on
@@ -56,6 +56,20 @@
 /sbin/update-bootloader
 
 %changelog -n perl-Bootloader
+* Fri May 19 2006 - jplack@suse.de
+- fix xen section counting when adding (#161559)
+- omit bogus warning (#165158)
+- move check for bool type to save code area (#175228)
+- do syntax checking for global "default" parameter. Has to be an
+  integer (#174829)
+- bump version to 0.2.23
+* Fri May 12 2006 - jplack@suse.de
+- do not accept empty product string
+* Fri May 12 2006 - jplack@suse.de
+- call setlocale only when neccessary (helps with --refresh in
+  instsys)
+- do not define opt_xen_kernel initially hence else all new entries
+  will be xen entries.
 * Wed May 10 2006 - jplack@suse.de
 - fix blocking bootloader issue (all archs) found by kukuk right
   now: bootloader config files are not moved to final destination

++++++ perl-Bootloader-0.2.22.tar.bz2 -> perl-Bootloader-0.2.23.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.22/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.2.23/lib/Bootloader/Core/GRUB.pm
--- old/perl-Bootloader-0.2.22/lib/Bootloader/Core/GRUB.pm	2006-04-28 19:01:15.000000000 +0200
+++ new/perl-Bootloader-0.2.23/lib/Bootloader/Core/GRUB.pm	2006-05-15 16:10:36.000000000 +0200
@@ -1183,7 +1183,10 @@
 	}
 	if ($key eq "default")
 	{
-	    $ret{"default"} = $sections[$line_ref->{"value"}];
+	    # cast $val to integer. That means that if no valid default has
+	    # been given, weÂll take the first section as default.
+	    my $defindex = 0+$val;
+	    $ret{"default"} = $sections[$defindex];
 	}
 	elsif ($key eq "timeout" || $key eq "password")
 	{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.22/lib/Bootloader/Core/PowerLILO.pm new/perl-Bootloader-0.2.23/lib/Bootloader/Core/PowerLILO.pm
--- old/perl-Bootloader-0.2.22/lib/Bootloader/Core/PowerLILO.pm	2006-04-03 17:36:14.000000000 +0200
+++ new/perl-Bootloader-0.2.23/lib/Bootloader/Core/PowerLILO.pm	2006-05-15 17:50:27.000000000 +0200
@@ -598,13 +598,12 @@
 
 	    $line_ref->{"value"} = $sectinfo{$key};
 	    delete ($sectinfo{$key});
-	}
-
-	my ($stype) = split /:/, $so->{$type . "_" . $key};
-	# bool values appear in a config file or not
-	if ($stype eq "bool") {
-	    next if $line_ref->{"value"} ne "true";
-	    $line_ref->{"value"} = "";
+	    my ($stype) = split /:/, $so->{$type . "_" . $key};
+	    # bool values appear in a config file or not
+	    if ($stype eq "bool") {
+	        next if $line_ref->{"value"} ne "true";
+	        $line_ref->{"value"} = "";
+	    }
 	}
 
 	push @lines_new, $line_ref if defined $line_ref;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.22/lib/Bootloader/Tools.pm new/perl-Bootloader-0.2.23/lib/Bootloader/Tools.pm
--- old/perl-Bootloader-0.2.22/lib/Bootloader/Tools.pm	2006-05-10 16:01:29.000000000 +0200
+++ new/perl-Bootloader-0.2.23/lib/Bootloader/Tools.pm	2006-05-16 13:05:09.000000000 +0200
@@ -144,13 +144,9 @@
     my $udev = shift;
     my $cmd = "udevinfo -q name -p /block/$udev";
     my $dev = qx{ $cmd };
-
-    unless ($dev) {
-	warn "Cannot run '$cmd' properly";
-	return "/dev/$udev";
-    }
     chomp ($dev);
-    return "/dev/$dev";
+
+    return $dev ? "/dev/$dev" : "/dev/$udev";
 }
 
 =item

++++++ update-bootloader ++++++
--- perl-Bootloader/update-bootloader	2006-05-09 18:51:55.000000000 +0200
+++ perl-Bootloader/update-bootloader	2006-05-19 16:12:54.000000000 +0200
@@ -10,7 +10,7 @@
 my %oper;
 my ($opt_default, $opt_force, $opt_help, $opt_man, $opt_previous, $opt_xen)
     = (0,0,0,0,0,0);
-my ($opt_image, $opt_initrd, $opt_name, $opt_xen_kernel) = ('','','','');
+my ($opt_image, $opt_initrd, $opt_name, $opt_xen_kernel) = ('','','',undef);
 my $add_product = 0;
 
 =head1 NAME
@@ -107,7 +107,7 @@
     # First try: Does yast work these days?
     $namever = `yast2 print-product 2>&1`;	
     chomp $namever;
-    return "$namever" if $namever !~ /\n/;
+    return "$namever" if $namever != '' and $namever !~ /\n/;
 
     # Second try: Is there a usable /etc/SuSE-release?
     if (open(RELEASE, "</etc/SuSE-release")) {
@@ -123,8 +123,6 @@
 }
 
 
-setlocale(LC_MESSAGES, Bootloader::Tools::GetSystemLanguage());
-
 GetOptions (\%oper,
     'add|a'    	 ,
     'refresh'    ,
@@ -216,6 +214,8 @@
 
     # only localize on grub and lilo
     if ($loader eq "grub" || $loader eq "lilo") {
+	setlocale(LC_MESSAGES, Bootloader::Tools::GetSystemLanguage());
+
 	my $d =  Locale::gettext->domain("bootloader");
 	$d->dir("/usr/share/YaST2/locale");
 	my $opt_trans = $d->get($opt_name);
@@ -237,20 +237,20 @@
     pod2usage("Please specify name and kernel image for new section")
 	unless $opt_name and $opt_image;
 
-    if (CountSections(type => "$type", image => "$opt_image") != 0)
+    my @params = (
+		  type  => $type eq "xen" ? "image" : $type,
+		  image => $opt_image,
+    );
+    if (CountSections(@params) != 0)
     {
     	if (not $opt_force) {
 	    pod2usage("There are already sections with image '$opt_image'");
 	}
     } else {
-	my @params = (
-		      type =>$type,
-		      name =>$opt_name,
-		      image=>$opt_image,
-		      default=>$opt_default,
-	);
-	push @params, xen => $opt_xen_kernel if $type eq "xen";
-	push @params, initrd=> $opt_initrd if $opt_initrd;
+	push @params, name    => $opt_name;
+	push @params, default => $opt_default;
+	push @params, xen     => $opt_xen_kernel if $type eq "xen";
+	push @params, initrd  => $opt_initrd if $opt_initrd;
 			  
 	AddSection(@params);
     }
@@ -258,12 +258,12 @@
 
 if (defined $oper{remove}) {
     my @params = (
-		  type  =>$type eq "xen" ? "image" : $type,
-		  image =>$opt_image,
+		  type  => $type eq "xen" ? "image" : $type,
+		  image => $opt_image,
     );
-    push @params, xen => $opt_xen_kernel if $type eq "xen";
-    push @params, initrd=>$opt_initrd if $opt_initrd;
-    push @params, name  =>$opt_name if $opt_name;
+    push @params, xen    => $opt_xen_kernel if $type eq "xen";
+    push @params, initrd => $opt_initrd if $opt_initrd;
+    push @params, name   => $opt_name if $opt_name;
 		      
     my $num = CountSections(@params);
     if ($num > 0) {


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)