Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Mon Mar 1 01:46:08 CET 2010. -------- --- perl-Bootloader/perl-Bootloader.changes 2010-01-03 15:41:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2010-02-26 15:05:00.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Feb 26 14:01:47 UTC 2010 - jreidinger@novell.com + +- don't print outside if mdadm missing (bnc#578003) +- fix splitting of values which now doesn't use that structure + (bnc#566020) +- adapt to new version of getting product description (bnc#583034) +- 0.5.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.8.tar.bz2 New: ---- perl-Bootloader-0.5.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.Vk1Jdn/_old 2010-03-01 01:45:54.000000000 +0100 +++ /var/tmp/diff_new_pack.Vk1Jdn/_new 2010-03-01 01:45:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.5.8) +# spec file for package perl-Bootloader (Version 0.5.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: perl-Bootloader -Version: 0.5.8 -Release: 2 +Version: 0.5.9 +Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs Recommends: perl-gettext ++++++ perl-Bootloader-0.5.8.tar.bz2 -> perl-Bootloader-0.5.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.8/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.9/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.8/lib/Bootloader/Core/GRUB.pm 2009-12-15 14:03:27.000000000 +0100 +++ new/perl-Bootloader-0.5.9/lib/Bootloader/Core/GRUB.pm 2010-01-04 16:37:28.000000000 +0100 @@ -1682,7 +1682,7 @@ next; } - my ($type) = split(/:/, $go->{$key}||""); + my $type = $go->{$key}||""; if ($key eq "root" or $key eq "rootnoverify") { $grub_root = $val; @@ -1845,7 +1845,7 @@ # only accept known global options :-) next unless exists $go->{$key}; next if $key =~ m/^boot_/; # handled else where - my ($type) = split /:/, $go->{$key}; + my $type = $go->{$key} || ""; if ($key eq "default") { $value = $self->IndexOfSection ($value, $sections_ref) || 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.8/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.9/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.5.8/lib/Bootloader/Tools.pm 2009-12-04 14:16:44.000000000 +0100 +++ new/perl-Bootloader-0.5.9/lib/Bootloader/Tools.pm 2010-02-25 13:26:07.000000000 +0100 @@ -661,14 +661,13 @@ open (MD, "$mdadm --detail --verbose --scan |"); } else { - $logger->error ("The command \"mdadm\" is not available."); - $logger->error ("Is the package \"mdadm\" installed?"); + $logger->milestone ("The command \"mdadm\" is not available."); + $logger->milestone ("Expect that system doesn't have MD array."); - # If the command "mdadm" isn't available, return a reference to an - # empty hash - return \%mapping; + # If the command "mdadm" isn't available, return a reference to an + # empty hash + return \%mapping; } - my ($array, $level, $num_devices); $logger->milestone("Tools::ReadRAID1Arrays: start parsing mdadm --detail --verbose --scan:"); ++++++ update-bootloader ++++++ --- /var/tmp/diff_new_pack.Vk1Jdn/_old 2010-03-01 01:45:54.000000000 +0100 +++ /var/tmp/diff_new_pack.Vk1Jdn/_new 2010-03-01 01:45:54.000000000 +0100 @@ -111,41 +111,22 @@ =cut # Get product name and version -# FIXME: There is still no guaranteed-to-work solution -# FIXME: as Commandline:: always prints to stderr, which is risky -# FIXME: to get garbage. -# If Commandline:: prints garbage, use /etc/SuSE-release instead +# If zypper is not available or versions is empty, use /etc/SuSE-release instead +# linux is last possible fallback sub GetProduct { my $namever; + my $loader = Bootloader::Tools::GetBootloader(); - # first try: new zypp-query-pool adopted to our needs - my @product_query = split ('\|', qx{/usr/lib/zypp/zypp-query-pool products \@system}); - my $found = 0; - my $i = 0; - - for ($i = 0; $i <= @product_query; $i++){ - if ($product_query[$i] eq "base"){ - $found = 1; - last; - } + # first try: use zypper + if ( -f '/usr/bin/zypper' ){ + my $zypper_xml = qx{ZYPP_READONLY_HACK=1 zypper -qx --no-refresh pd -i | grep 'isbase="1"'}; + if ($zypper_xml =~ m/^.*summary="([^"]*)".*shortname="([^"]*)".*$/){ + return $1 if ($1 ne ""); #FIXME add here exceptions if bootloader has problems with long names + return $2 if ($2 ne ""); + } } - # Determine the bootloader type, because long product names may only - # be used in case of grub - my $loader = Bootloader::Tools::GetBootloader(); - # Substitude whitespaces with an underscore - if ($found){ - if ($loader ne "grub") { - $namever = $product_query[$i+1]; - $namever =~ s/\s/_/g; - } - else{ - $namever = $product_query[$i+2]; - } - chomp $namever; - } - return "$namever" if $namever ne '' and $namever !~ /\n/; # Second try: Is there a usable /etc/SuSE-release? # This should really not be used anymore, as the syntax changed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org