From b72dc8b592a44acac8fecfe47d475485162c7ff5 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Sat, 15 Mar 2003 15:45:51 +0000
Subject: fix a fatal error in drakpem in editable mode

---
 perl-install/drakxtools.spec  |  5 ++++-
 perl-install/install_steps.pm | 10 ++++++++++
 perl-install/share/rpmsrate   |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index b9a503881..475367859 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
 Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
 Name:    drakxtools
 Version: 9.1
-Release: 24mdk
+Release: 25mdk
 Url: http://www.mandrakelinux.com/en/drakx.php3
 Source0: %name-%version.tar.bz2
 License: GPL
@@ -303,6 +303,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
 %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
 
 %changelog
+* Sat Mar 15 2003 Warly <warly@mandrakesoft.com> 9.1-25mdk
+- fix drakperm fatal error in editable mode
+
 * Fri Mar 14 2003 Pixel <pixel@mandrakesoft.com> 9.1-24mdk
 - fix XFdrake handling NVidia proprietary drivers
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8a7f5578f..3912e5d0e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -884,10 +884,20 @@ sub setupBootloaderBefore {
 					  detect_devices::matching_desc('GeForce.*Integrated') #- needed for fbdev driver (hack).
 					 );
 
+<<<<<<< install_steps.pm
+	#- propose the default fb mode for kernel fb, if aurora is installed too.
+	my $has_aurora = do {
+	    my $p = pkgs::packageByName($o->{packages}, 'bootsplash');
+=======
 	#- propose the default fb mode for kernel fb, if aurora or bootsplash is installed.
 	my $need_fb = any {
 	    my $p = pkgs::packageByName($o->{packages}, $_);
+<<<<<<< install_steps.pm
+>>>>>>> 1.472
+	    $p && pkgs::packageFlagInstalled($p);
+=======
 	    $p && $p->flag_installed;
+>>>>>>> 1.504
 	} 'Aurora', 'bootsplash';
         bootloader::suggest($o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab},
 			    vga_fb => ($force_vga || $vga && $need_fb) && $o->{vga}, 
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index d1a540f85..160980a7a 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -443,7 +443,7 @@ FILE_TOOLS
   1 xdelta
 
 WEBMIN
-  3 webmin
+  5 webmin
 
 WIZARDS
   5 drakwizard
-- 
cgit v1.2.1