Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:12.2
checked in at 2012-07-01 15:15:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/perl-Bootloader (Old)
and /work/SRC/openSUSE:12.2/.perl-Bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader", Maintainer is "snw...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/perl-Bootloader/perl-Bootloader.changes
2012-06-25 15:48:32.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.perl-Bootloader.new/perl-Bootloader.changes
2012-07-02 10:44:33.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 29 16:20:02 CEST 2012 - snw...@suse.de
+
+- mchang: fix error caused by grub.cfg missing (bnc#769350)
+- make dependency on Pod::Usage optional (bnc#760464)
+- 0.6.5
+
+-------------------------------------------------------------------
Old:
----
perl-Bootloader-0.6.4.tar.bz2
New:
----
perl-Bootloader-0.6.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.K4OB85/_old 2012-07-02 10:44:33.000000000 +0200
+++ /var/tmp/diff_new_pack.K4OB85/_new 2012-07-02 10:44:33.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Bootloader
-Version: 0.6.4
+Version: 0.6.5
Release: 0
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
++++++ perl-Bootloader-0.6.4.tar.bz2 -> perl-Bootloader-0.6.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.4/perl-Bootloader.changes
new/perl-Bootloader-0.6.5/perl-Bootloader.changes
--- old/perl-Bootloader-0.6.4/perl-Bootloader.changes 2012-06-04
15:47:41.000000000 +0200
+++ new/perl-Bootloader-0.6.5/perl-Bootloader.changes 2012-06-29
16:21:41.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jun 29 16:20:02 CEST 2012 - snw...@suse.de
+
+- mchang: fix error caused by grub.cfg missing (bnc#769350)
+- make dependency on Pod::Usage optional (bnc#760464)
+- 0.6.5
+
+-------------------------------------------------------------------
Mon Jun 4 15:40:15 CEST 2012 - mch...@suse.com
- support console related global options gfxterm, serial, gfxbackground and
gfxmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.4/src/Core/GRUB2.pm
new/perl-Bootloader-0.6.5/src/Core/GRUB2.pm
--- old/perl-Bootloader-0.6.4/src/Core/GRUB2.pm 2012-06-04 15:47:41.000000000
+0200
+++ new/perl-Bootloader-0.6.5/src/Core/GRUB2.pm 2012-06-29 16:21:41.000000000
+0200
@@ -314,11 +314,15 @@
# list<string> ListFiles ()
sub ListFiles {
my $self = shift;
+ my @ret = ( Bootloader::Path::Grub2_devicemap(),
+ Bootloader::Path::Grub2_installdevice(),
+ Bootloader::Path::Grub2_defaultconf() );
- return [ Bootloader::Path::Grub2_devicemap(),
- Bootloader::Path::Grub2_installdevice(),
- Bootloader::Path::Grub2_defaultconf(),
- Bootloader::Path::Grub2_conf() ];
+ if (-e Bootloader::Path::Grub2_conf()) {
+ push @ret, Bootloader::Path::Grub2_conf();
+ }
+
+ return \@ret;
}
=item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm
new/perl-Bootloader-0.6.5/src/Core/GRUB2EFI.pm
--- old/perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm 2012-06-04
15:47:41.000000000 +0200
+++ new/perl-Bootloader-0.6.5/src/Core/GRUB2EFI.pm 2012-06-29
16:21:41.000000000 +0200
@@ -86,9 +86,13 @@
# list<string> ListFiles ()
sub ListFiles {
my $self = shift;
+ my @ret = (Bootloader::Path::Grub2_defaultconf());
- return [ Bootloader::Path::Grub2_defaultconf(),
- Bootloader::Path::Grub2_eficonf() ];
+ if (-e Bootloader::Path::Grub2_eficonf()) {
+ push @ret, Bootloader::Path::Grub2_eficonf();
+ }
+
+ return \@ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.4/update-bootloader
new/perl-Bootloader-0.6.5/update-bootloader
--- old/perl-Bootloader-0.6.4/update-bootloader 2012-06-04 15:47:41.000000000
+0200
+++ new/perl-Bootloader-0.6.5/update-bootloader 2012-06-29 16:21:41.000000000
+0200
@@ -2,12 +2,20 @@
use POSIX;
use Getopt::Long;
-use Pod::Usage;
use Bootloader::Tools;
use Bootloader::Path;
use Bootloader::MBRTools;
use strict;
+# keep Pod::Usage optional (bnc #760464)
+eval "use Pod::Usage";
+
+if(!exists $::{pod2usage}) {
+ sub pod2usage {
+ die "usage: update-bootloader [operation] [options]\n";
+ }
+}
+
my %oper;
my ($opt_default, $opt_force, $opt_force_default, $opt_help, $opt_man,
$opt_previous, $opt_xen)
= (0,0,0,0,0,0,0);
@@ -184,13 +192,13 @@
pod2usage(1) if $opt_help;
pod2usage(-exitstatus => 0, -verbose => 2) if $opt_man;
-pod2usage("Specify exactly one operation, either 'add', 'remove' or 'refresh'")
+die("Specify exactly one operation, either 'add', 'remove' or 'refresh'\n")
unless scalar keys(%oper) == 1;
-pod2usage("Option 'default' is only allowed for operation 'add'")
+die("Option 'default' is only allowed for operation 'add'\n")
if ($opt_default and not defined $oper{add});
-pod2usage("Option 'force-default' is only allowed for operation 'add'")
+die("Option 'force-default' is only allowed for operation 'add'\n")
if ($opt_force_default and not defined $oper{add});
if (defined $oper{"examinembr"}) {
@@ -379,10 +387,10 @@
if (defined $oper{add}) {
open (LOG, ">>$logname");
print LOG ("update-bootloader: now executing operation add\n");
- print LOG ("update-bootloader: changed opt name is $opt_name \n");
+ print LOG ("update-bootloader: changed opt name is $opt_name\n");
close LOG;
- pod2usage("Please specify name and kernel image for new section")
+ die("Please specify name and kernel image for new section\n")
unless $opt_name and $opt_image;
my @params = (
@@ -391,7 +399,7 @@
);
if (CountSections(@params) != 0) {
if (not $opt_force) {
- pod2usage("There are already sections with image '$opt_image'");
+ die("There are already sections with image '$opt_image'\n");
}
open (LOG, ">>$logname");
print LOG ("update-bootloader: section already exist. Skip add.\n");
@@ -496,7 +504,7 @@
print LOG ("update-bootloader: found $num sections, no opt_force:
not removing\n");
close LOG;
- pod2usage("There is more than one section with image '$opt_image'");
+ die("There is more than one section with image '$opt_image'\n");
} else {
open (LOG, ">>$logname");
print LOG ("update-bootloader: calling Tools::RemoveSections\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.4/version
new/perl-Bootloader-0.6.5/version
--- old/perl-Bootloader-0.6.4/version 2012-06-04 15:47:41.000000000 +0200
+++ new/perl-Bootloader-0.6.5/version 2012-06-29 16:21:41.000000000 +0200
@@ -1 +1 @@
-0.6.4
+0.6.5
++++++ update-bootloader ++++++
--- /var/tmp/diff_new_pack.K4OB85/_old 2012-07-02 10:44:34.000000000 +0200
+++ /var/tmp/diff_new_pack.K4OB85/_new 2012-07-02 10:44:34.000000000 +0200
@@ -2,12 +2,20 @@
use POSIX;
use Getopt::Long;
-use Pod::Usage;
use Bootloader::Tools;
use Bootloader::Path;
use Bootloader::MBRTools;
use strict;
+# keep Pod::Usage optional (bnc #760464)
+eval "use Pod::Usage";
+
+if(!exists $::{pod2usage}) {
+ sub pod2usage {
+ die "usage: update-bootloader [operation] [options]\n";
+ }
+}
+
my %oper;
my ($opt_default, $opt_force, $opt_force_default, $opt_help, $opt_man,
$opt_previous, $opt_xen)
= (0,0,0,0,0,0,0);
@@ -184,13 +192,13 @@
pod2usage(1) if $opt_help;
pod2usage(-exitstatus => 0, -verbose => 2) if $opt_man;
-pod2usage("Specify exactly one operation, either 'add', 'remove' or 'refresh'")
+die("Specify exactly one operation, either 'add', 'remove' or 'refresh'\n")
unless scalar keys(%oper) == 1;
-pod2usage("Option 'default' is only allowed for operation 'add'")
+die("Option 'default' is only allowed for operation 'add'\n")
if ($opt_default and not defined $oper{add});
-pod2usage("Option 'force-default' is only allowed for operation 'add'")
+die("Option 'force-default' is only allowed for operation 'add'\n")
if ($opt_force_default and not defined $oper{add});
if (defined $oper{"examinembr"}) {
@@ -379,10 +387,10 @@
if (defined $oper{add}) {
open (LOG, ">>$logname");
print LOG ("update-bootloader: now executing operation add\n");
- print LOG ("update-bootloader: changed opt name is $opt_name \n");
+ print LOG ("update-bootloader: changed opt name is $opt_name\n");
close LOG;
- pod2usage("Please specify name and kernel image for new section")
+ die("Please specify name and kernel image for new section\n")
unless $opt_name and $opt_image;
my @params = (
@@ -391,7 +399,7 @@
);
if (CountSections(@params) != 0) {
if (not $opt_force) {
- pod2usage("There are already sections with image '$opt_image'");
+ die("There are already sections with image '$opt_image'\n");
}
open (LOG, ">>$logname");
print LOG ("update-bootloader: section already exist. Skip add.\n");
@@ -496,7 +504,7 @@
print LOG ("update-bootloader: found $num sections, no opt_force:
not removing\n");
close LOG;
- pod2usage("There is more than one section with image '$opt_image'");
+ die("There is more than one section with image '$opt_image'\n");
} else {
open (LOG, ">>$logname");
print LOG ("update-bootloader: calling Tools::RemoveSections\n");
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
