commit perl-Bootloader

26 Sep 2007

Hello community,

here is the log from the commit of package perl-Bootloader
checked in at Wed Sep 26 21:43:58 CEST 2007.

--------

--- perl-Bootloader/perl-Bootloader.changes	2007-09-24 18:25:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/STABLE/perl-Bootloader/perl-Bootloader.changes	2007-09-26 21:04:19.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 26 21:01:33 CEST 2007 - od@suse.de
+
+- Added flag avoid_reading_device_map to Library::ReadSettings()
+  and to all ParseLines() (#328448)
+- Added more logging to GrubDev2UnixDev()
+- Version bump to 0.4.32
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.RP2734/_old	2007-09-26 21:43:43.000000000 +0200
+++ /var/tmp/diff_new_pack.RP2734/_new	2007-09-26 21:43:43.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.4.31)
+# spec file for package perl-Bootloader (Version 0.4.32)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           perl-Bootloader
-Version:        0.4.31
+Version:        0.4.32
 Release:        1
 Requires:       perl >= %{perl_version}
 Requires:       perl-gettext
@@ -65,6 +65,11 @@
 /sbin/update-bootloader
 /usr/lib/bootloader
 %changelog
+* Wed Sep 26 2007 - od@suse.de
+- Added flag avoid_reading_device_map to Library::ReadSettings()
+  and to all ParseLines() (#328448)
+- Added more logging to GrubDev2UnixDev()
+- Version bump to 0.4.32
 * Mon Sep 24 2007 - aosthof@suse.de
 - Fixed missing image line in lilo (#294432)
 * Fri Sep 21 2007 - aosthof@suse.de


++++++ perl-Bootloader-0.4.31.tar.bz2 -> perl-Bootloader-0.4.32.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.31/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.4.32/lib/Bootloader/Core/ELILO.pm
--- old/perl-Bootloader-0.4.31/lib/Bootloader/Core/ELILO.pm	2007-04-25 19:13:32.000000000 +0200
+++ new/perl-Bootloader-0.4.32/lib/Bootloader/Core/ELILO.pm	2007-09-26 21:04:19.000000000 +0200
@@ -20,7 +20,7 @@
 
 C<< $files_ref = Bootloader::Core::ELILO->ListFiles (); >>
 
-C<< $status = Bootloader::Core::ELILO->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::ELILO->ParseLines (\%files, $avoid_reading_device_map); >>
 
 C<< $files_ref = Bootloader::Core::ELILO->CreateLines (); >>
 
@@ -267,20 +267,24 @@
 
 
 =item
-C<< $status = Bootloader::Core::ELILO->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::ELILO->ParseLines (\%files, $avoid_reading_device_map); >>
 
 Parses the contents of all files and stores the settings in the
-internal structures. As argument, it takes a hash reference, where
-keys are file names and values are references to lists, each member is
-one line of the file. Returns undef on fail, defined nonzero value on
-success.
+internal structures. As first argument, it takes a hash reference,
+where keys are file names and values are references to lists, each
+member is one line of the file. As second argument, it takes a
+boolean flag that, if set to a true value, causes it to skip
+updating the internal device_map information. The latter argument
+is not used for ELILO. Returns undef on fail, defined nonzero
+value on success.
 
 =cut
 
-# void ParseLines (map<string,list<string>>)
+# void ParseLines (map<string,list<string>>, boolean)
 sub ParseLines {
     my $self = shift;
     my %files = %{+shift};
+    my $avoid_reading_device_map = shift;
 
     # the only file is /etc/elilo.conf
     my @elilo_conf = @{$files{$default_conf} || []};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.31/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.32/lib/Bootloader/Core/GRUB.pm
--- old/perl-Bootloader-0.4.31/lib/Bootloader/Core/GRUB.pm	2007-09-17 20:39:36.000000000 +0200
+++ new/perl-Bootloader-0.4.32/lib/Bootloader/Core/GRUB.pm	2007-09-26 21:04:19.000000000 +0200
@@ -36,7 +36,7 @@
 
 C<< $files_ref = Bootloader::Core::GRUB->ListFiles (); >>
 
-C<< $status = Bootloader::Core::GRUB->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::GRUB->ParseLines (\%files, $avoid_reading_device_map); >>
 
 C<< $files_ref = Bootloader::Core::GRUB->CreateLines (); >>
 
@@ -418,12 +418,13 @@
 	chomp ($resolved_link);
 	$dev = "/dev/" . $resolved_link; 
     }
+    $self->l_milestone ("GRUB::GrubDev2UnixDev: udevinfo returned: $dev");
 
     if (defined ($partition)) {
 	foreach my $dev_ref (@{$self->{"partitions"}}) {
 	    if ($dev_ref->[1] eq $dev && $dev_ref->[2] == $partition) {
 		$dev = $dev_ref->[0];
-		$self->l_debug ("GRUB::GrubDev2UnixDev: Translated $original to $dev");
+		$self->l_milestone ("GRUB::GrubDev2UnixDev: Translated $original to $dev");
 		return $dev;
 	    }
 	}
@@ -685,20 +686,23 @@
 }
 
 =item
-C<< $status = Bootloader::Core::GRUB->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::GRUB->ParseLines (\%files, $avoid_reading_device_map); >>
 
 Parses the contents of all files and stores the settings in the
-internal structures. As argument, it takes a hash reference, where
-keys are file names and values are references to lists, each member is
-one line of the file. Returns undef on fail, defined nonzero value on
-success.
+internal structures. As first argument, it takes a hash reference, where
+keys are file names and values are references to lists, each
+member is one line of the file. As second argument, it takes a
+boolean flag that, if set to a true value, causes it to skip
+updating the internal device_map information. Returns undef on
+fail, defined nonzero value on success.
 
 =cut
 
-# void ParseLines (map<string,list<string>>)
+# void ParseLines (map<string,list<string>>, boolean)
 sub ParseLines {
     my $self = shift;
     my %files = %{+shift};
+    my $avoid_reading_device_map = shift;
 
     #first set the device map - other parsing uses it
     my @device_map = @{$files{"/boot/grub/device.map"} || []};
@@ -710,7 +714,7 @@
 	    $devmap{$2} = $1;
 	}
     };
-    $self->{"device_map"} = \%devmap;
+    $self->{"device_map"} = \%devmap	if (! $avoid_reading_device_map);
 
     # and now proceed with menu.lst
     my @menu_lst = @{$files{"/boot/grub/menu.lst"} || []};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.31/lib/Bootloader/Core/LILO.pm new/perl-Bootloader-0.4.32/lib/Bootloader/Core/LILO.pm
--- old/perl-Bootloader-0.4.31/lib/Bootloader/Core/LILO.pm	2006-04-03 17:36:14.000000000 +0200
+++ new/perl-Bootloader-0.4.32/lib/Bootloader/Core/LILO.pm	2007-09-26 21:04:19.000000000 +0200
@@ -20,7 +20,7 @@
 
 C<< $files_ref = Bootloader::Core::LILO->ListFiles (); >>
 
-C<< $status = Bootloader::Core::LILO->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::LILO->ParseLines (\%files, $avoid_reading_device_map); >>
 
 C<< $files_ref = Bootloader::Core::LILO->CreateLines (); >>
 
@@ -121,20 +121,23 @@
 
 
 =item
-C<< $status = Bootloader::Core::LILO->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::LILO->ParseLines (\%files, $avoid_reading_device_map); >>
 
 Parses the contents of all files and stores the settings in the
-internal structures. As argument, it takes a hash reference, where
-keys are file names and values are references to lists, each member is
-one line of the file. Returns undef on fail, defined nonzero value on
-success.
+internal structures. As first argument, it takes a hash reference,
+where keys are file names and values are references to lists, each
+member is one line of the file. As second argument, it takes a
+boolean flag that, if set to a true value, causes it to skip
+updating the internal device_map information. Returns undef on
+fail, defined nonzero value on success.
 
 =cut
 
-# void ParseLines (map<string,list<string>>)
+# void ParseLines (map<string,list<string>>, boolean)
 sub ParseLines {
     my $self = shift;
     my %files = %{+shift};
+    my $avoid_reading_device_map = shift;
 
     # the only file is /etc/lilo.conf
     my @lilo_conf = @{$files{"/etc/lilo.conf"} || []};
@@ -165,7 +168,8 @@
 
     $self->{"sections"} = $sect_ref;
     $self->{"global"} = $glob_ref;
-    $self->{"device_map"} = \%devmap if (scalar (keys (%devmap)) > 0);
+    $self->{"device_map"} = \%devmap if (! $avoid_reading_device_map &&
+					 scalar (keys (%devmap)) > 0);
     return 1;
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.31/lib/Bootloader/Core/PowerLILO.pm new/perl-Bootloader-0.4.32/lib/Bootloader/Core/PowerLILO.pm
--- old/perl-Bootloader-0.4.31/lib/Bootloader/Core/PowerLILO.pm	2006-11-17 14:59:53.000000000 +0100
+++ new/perl-Bootloader-0.4.32/lib/Bootloader/Core/PowerLILO.pm	2007-09-26 21:04:19.000000000 +0200
@@ -20,7 +20,7 @@
 
 C<< $files_ref = Bootloader::Core::PowerLILO->ListFiles (); >>
 
-C<< $status = Bootloader::Core::PowerLILO->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::PowerLILO->ParseLines (\%files, $avoid_reading_device_map); >>
 
 C<< $files_ref = Bootloader::Core::PowerLILO->CreateLines (); >>
 
@@ -309,20 +309,24 @@
 
 
 =item
-C<< $status = Bootloader::Core::PowerLILO->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::PowerLILO->ParseLines (\%files, $avoid_reading_device_map); >>
 
 Parses the contents of all files and stores the settings in the
-internal structures. As argument, it takes a hash reference, where
+internal structures. As first argument, it takes a hash reference, where
 keys are file names and values are references to lists, each member is
-one line of the file. Returns undef on fail, defined nonzero value on
+one line of the file. As second argument, it takes a boolean flag
+that, if set to a true value, causes it to skip updating the
+internal device_map information. The latter argument is not used
+for PowerLILO. Returns undef on fail, defined nonzero value on
 success.
 
 =cut
 
-# void ParseLines (map<string,list<string>>)
+# void ParseLines (map<string,list<string>>, boolean)
 sub ParseLines {
     my $self = shift;
     my %files = %{+shift};
+    my $avoid_reading_device_map = shift;
 
     # the only file is /etc/lilo.conf
     my @lilo_conf = @{$files{"/etc/lilo.conf"} || []};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.31/lib/Bootloader/Core/ZIPL.pm new/perl-Bootloader-0.4.32/lib/Bootloader/Core/ZIPL.pm
--- old/perl-Bootloader-0.4.31/lib/Bootloader/Core/ZIPL.pm	2007-07-06 10:32:11.000000000 +0200
+++ new/perl-Bootloader-0.4.32/lib/Bootloader/Core/ZIPL.pm	2007-09-26 21:04:19.000000000 +0200
@@ -26,7 +26,7 @@
 
 C<< $status = Bootloader::Core::ZIPL->FixSectionName ($name, \$names_ref, $type); >>
 
-C<< $status = Bootloader::Core::ZIPL->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::ZIPL->ParseLines (\%files, $avoid_reading_device_map); >>
 
 C<< $sections_ref Bootloader::Core->SplitLinesToSections (\@lines, \@section_starts); >>
 
@@ -288,20 +288,24 @@
 
 
 =item
-C<< $status = Bootloader::Core::ZIPL->ParseLines (\%files); >>
+C<< $status = Bootloader::Core::ZIPL->ParseLines (\%files, $avoid_reading_device_map); >>
 
 Parses the contents of all files and stores the settings in the
-internal structures. As argument, it takes a hash reference, where
-keys are file names and values are references to lists, each member is
-one line of the file. Returns undef on fail, defined nonzero value on
-success.
+internal structures. As first argument, it takes a hash reference,
+where keys are file names and values are references to lists, each
+member is one line of the file. As second argument, it takes a
+boolean flag that, if set to a true value, causes it to skip
+updating the internal device_map information. The latter argument
+is not used for ZIPL. Returns undef on fail, defined nonzero value
+on success.
 
 =cut
 
-# void ParseLines (map<string,list<string>>)
+# void ParseLines (map<string,list<string>>, boolean)
 sub ParseLines {
     my $self = shift;
     my %files = %{+shift};
+    my $avoid_reading_device_map = shift;
 
     # the only file is /etc/zipl.conf
     my @zipl_conf = @{$files{"/etc/zipl.conf"} || []};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.31/lib/Bootloader/Library.pm new/perl-Bootloader-0.4.32/lib/Bootloader/Library.pm
--- old/perl-Bootloader-0.4.31/lib/Bootloader/Library.pm	2007-04-02 12:59:58.000000000 +0200
+++ new/perl-Bootloader-0.4.32/lib/Bootloader/Library.pm	2007-09-26 21:04:19.000000000 +0200
@@ -298,6 +298,7 @@
 
 sub ReadSettings {
     my $self = shift;
+    my $avoid_reading_device_map = shift;
 
     my $loader = $self->{"loader"};
     return undef unless defined $loader;
@@ -307,7 +308,7 @@
     {
 	return undef;
     }
-    $loader->ParseLines ($files_ref);
+    $loader->ParseLines ($files_ref, $avoid_reading_device_map);
     return 1;
 }
 



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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)