OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-Bootloader?expand=0&rev=54

bootloader_entry

@@ -211,6 +211,11 @@ function remove_entry()
 
 		chmod 755 $delayed_exec_file
 	else
+		if [ -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/sysconfig/bootloader ] &&
+		   [ -f $PERL_BOOTLOADER_TESTSUITE_PATH/boot/grub/menu.lst -o \
+		     -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/lilo.conf      -o \
+		     -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/elilo.conf     -o \
+		     -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/zipl.conf ]; then
 		# Do not specify the name of a bootloader entry when removing it, thus
 		# removing all sections matching the kernel image and initrd names
 		# (either both a "linux" and a "failsafe" section, or a section
@@ -247,6 +252,7 @@ function remove_entry()
 		# Run the bootloader (e.g., lilo).
 		update_bootloader --refresh
                 fi
+	fi
 }
 
 

no_Env.diff

@@ -1,25 +0,0 @@
---- lib/Bootloader/Path.pm
-+++ lib/Bootloader/Path.pm
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- #
- # Set of path used in bootloader. Allows setting prefix via global variable
- # $PERL_BOOTLOADER_TESTSUITE_PATH
-@@ -9,15 +9,9 @@
- 
- use strict;
- 
--use Env qw($PERL_BOOTLOADER_TESTSUITE_PATH);
--
- sub Prefix {
-   my $value = shift;
--  if ( defined($PERL_BOOTLOADER_TESTSUITE_PATH) )
--  {
--    $value = $PERL_BOOTLOADER_TESTSUITE_PATH . $value;
--  }
--  return $value;
-+  return $ENV{PERL_BOOTLOADER_TESTSUITE_PATH} . $value;
- }
- 
- sub Logname {

perl-Bootloader-0.4.64.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:900bfac1eec5b2d7d852e4e83740089a358a585eb1b33d44e55280518c9078c1
-size 51294

perl-Bootloader-0.4.65.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cdb5c3d6e62ebc9050e595cdd2674bcd5731fcbf37705889a888c329112e76b4
+size 51254

perl-Bootloader.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 22 10:29:14 CEST 2008 - jreidinger@suse.cz
+
+- fix crash in update-bootloader (bnc #411161)
+- don't try remove kernel image if none bootloader installed
+  (bnc #237620)
+- version bump to 0.4.65 
+
 -------------------------------------------------------------------
 Mon Jul 21 18:42:53 CEST 2008 - snwint@suse.de
 

perl-Bootloader.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.4.64)
+# spec file for package perl-Bootloader (Version 0.4.65)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@
 
 
 Name:           perl-Bootloader
-Version:        0.4.64
-Release:        4
+Version:        0.4.65
+Release:        1
 Requires:       perl-base = %{perl_version}
 Requires:       e2fsprogs
 Recommends:     perl-gettext
@@ -24,7 +24,6 @@ Summary:        Library for Configuring Boot Loaders
 Source:         perl-Bootloader-%{version}.tar.bz2
 Source1:        update-bootloader
 Source2:        bootloader_entry
-Patch:          no_Env.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore: mdadm e2fsprogs limal-bootloader
 
@@ -43,7 +42,6 @@ Authors:
 
 %prep
 %setup -q
-%patch
 
 %build
 touch Makefile.PL
@@ -69,6 +67,11 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
 /usr/lib/bootloader
 
 %changelog
+* Tue Jul 22 2008 jreidinger@suse.cz
+- fix crash in update-bootloader (bnc #411161)
+- don't try remove kernel image if none bootloader installed
+  (bnc #237620)
+- version bump to 0.4.65
 * Mon Jul 21 2008 snwint@suse.de
 - removed 'use Env' from Path.pm (bnc #410878)
 * Thu Jul 17 2008 jreidinger@suse.cz

update-bootloader

@@ -285,6 +285,7 @@ if (defined $oper{add}) {
 
     # only localize on grub and lilo
     if (($loader eq "grub" || $loader eq "lilo") && defined(test_gettext())) {
+        require Locale::gettext;
 	setlocale(LC_MESSAGES, Bootloader::Tools::GetSystemLanguage());
 
 	my $d =  Locale::gettext->domain("bootloader");