Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2015-10-02 09:23:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2015-08-15 11:39:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2015-10-02 09:23:20.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Sep 30 12:17:54 UTC 2015 - snwint@suse.com + +- fix extended partition detection (bsc#947697) +- 0.843 + +------------------------------------------------------------------- +Tue Sep 22 16:25:39 CEST 2015 - snwint@suse.com + +- allow empty distributor, which for new grub2 means use os-release (bsc#942519) +- more fixes in grub2-efi +- fix empty distributor handling for grub2-efi (bsc#942519) +- 0.842 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.840.tar.xz New: ---- perl-Bootloader-0.843.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.1qfHPQ/_old 2015-10-02 09:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.1qfHPQ/_new 2015-10-02 09:23:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Bootloader # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.840 +Version: 0.843 Release: 0 Requires: coreutils Requires: perl-base = %{perl_version} ++++++ perl-Bootloader-0.840.tar.xz -> perl-Bootloader-0.843.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.840/VERSION new/perl-Bootloader-0.843/VERSION --- old/perl-Bootloader-0.840/VERSION 2015-08-14 16:05:09.000000000 +0200 +++ new/perl-Bootloader-0.843/VERSION 2015-09-30 14:17:16.000000000 +0200 @@ -1 +1 @@ -0.840 +0.843 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.840/changelog new/perl-Bootloader-0.843/changelog --- old/perl-Bootloader-0.840/changelog 2015-08-14 16:05:09.000000000 +0200 +++ new/perl-Bootloader-0.843/changelog 2015-09-30 14:17:16.000000000 +0200 @@ -1,3 +1,13 @@ +2015-09-30: 0.843 + - fix extended partition detection (bsc #947697) + +2015-09-22: 0.842 + - more fixes in grub2-efi + - fix empty distributor handling for grub2-efi (bsc #942519) + +2015-09-10: 0.841 + - allow empty distributor, which for new grub2 means use os-release (bnc #942519) + 2015-08-14: 0.840 - update git2log script to latest version - remove no longer needed quotes (bsc #940486) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.840/src/Core/GRUB2.pm new/perl-Bootloader-0.843/src/Core/GRUB2.pm --- old/perl-Bootloader-0.840/src/Core/GRUB2.pm 2015-08-14 16:05:09.000000000 +0200 +++ new/perl-Bootloader-0.843/src/Core/GRUB2.pm 2015-09-30 14:17:16.000000000 +0200 @@ -873,7 +873,7 @@ @lines = ( { 'key' => 'GRUB_DISTRIBUTOR', - 'value' => 'openSUSE', + 'value' => '""', 'comment_before' => [ '# If you change this file, run \'grub2-mkconfig -o /boot/grub2/grub.cfg\' afterwards to update', '# /boot/grub2/grub.cfg.' @@ -990,7 +990,9 @@ my $gfxmode = delete $globinfo{"gfxmode"} || ""; my $gfxtheme = delete $globinfo{"gfxtheme"} || ""; my $gfxbackground = delete $globinfo{"gfxbackground"} || ""; - my $distributor = delete $globinfo{"distributor"} || ""; + my $distributor = delete $globinfo{"distributor"}; + # handle empty default distributor + $distributor = '""' if $distributor eq ""; my $failsafe_disabled = delete $globinfo{"failsafe_disabled"} || ""; my $append_failsafe = delete $globinfo{"append_failsafe"} || ""; my $os_prober = delete $globinfo{"os_prober"} || ""; @@ -1080,8 +1082,8 @@ $terminal = ""; } } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { - $line_ref->{"value"} = "$distributor" if "$distributor" ne ""; - $distributor = ""; + $line_ref->{"value"} = $distributor; + $distributor = undef; } elsif ($key =~ m/@?GRUB_DISABLE_RECOVERY$/) { if ("$failsafe_disabled" ne "") { # uncomment option @@ -1169,10 +1171,10 @@ } } - if ("$distributor" ne "") { + if (defined($distributor)) { push @lines, { "key" => "GRUB_DISTRIBUTOR", - "value" => "$distributor", + "value" => $distributor, } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.840/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.843/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.840/src/Core/GRUB2EFI.pm 2015-08-14 16:05:09.000000000 +0200 +++ new/perl-Bootloader-0.843/src/Core/GRUB2EFI.pm 2015-09-30 14:17:16.000000000 +0200 @@ -457,7 +457,7 @@ @lines = ( { 'key' => 'GRUB_DISTRIBUTOR', - 'value' => 'openSUSE', + 'value' => '""', 'comment_before' => [ '# If you change this file, run \'grub2-mkconfig -o /boot/grub2/grub.cfg\' afterwards to update', '# /boot/grub2/grub.cfg.' @@ -582,7 +582,9 @@ my $gfxmode = delete $globinfo{"gfxmode"} || ""; my $gfxtheme = delete $globinfo{"gfxtheme"} || ""; my $gfxbackground = delete $globinfo{"gfxbackground"} || ""; - my $distributor = delete $globinfo{"distributor"} || ""; + my $distributor = delete $globinfo{"distributor"}; + # handle empty default distributor + $distributor = '""' if $distributor eq ""; my $failsafe_disabled = delete $globinfo{"failsafe_disabled"} || ""; my $append_failsafe = delete $globinfo{"append_failsafe"} || ""; my $os_prober = delete $globinfo{"os_prober"} || ""; @@ -672,8 +674,8 @@ $terminal = ""; } } elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) { - $line_ref->{"value"} = "$distributor" if "$distributor" ne ""; - $distributor = ""; + $line_ref->{"value"} = $distributor; + $distributor = undef; } elsif ($key =~ m/@?GRUB_DISABLE_RECOVERY$/) { if ("$failsafe_disabled" ne "") { # uncomment option @@ -762,10 +764,10 @@ } } - if ("$distributor" ne "") { + if (defined($distributor)) { push @lines, { "key" => "GRUB_DISTRIBUTOR", - "value" => "$distributor", + "value" => $distributor, } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.840/src/Core.pm new/perl-Bootloader-0.843/src/Core.pm --- old/perl-Bootloader-0.840/src/Core.pm 2015-08-14 16:05:09.000000000 +0200 +++ new/perl-Bootloader-0.843/src/Core.pm 2015-09-30 14:17:16.000000000 +0200 @@ -302,7 +302,7 @@ foreach my $part_ref (@{$self->{"partitions"}}) { if ($part_ref->[1] eq $disk_dev and - $part_ref->[5] eq "`extended") { + ($part_ref->[5] eq "`extended" || $part_ref->[5] eq ":extended")) { $extended_part_dev = $part_ref->[0]; } }