diff options
Diffstat (limited to 'perl-install/install/steps.pm')
| -rw-r--r-- | perl-install/install/steps.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index e6df1ef17..ca9281822 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -1,4 +1,4 @@ -package install::steps; # $Id$ +package install::steps; # $Id: steps.pm 268013 2010-04-29 15:02:04Z pterjan $ use diagnostics; use strict; @@ -289,7 +289,7 @@ sub upgrading_redhat() { undef *URPM::Package::compare_pkg; *URPM::Package::compare_pkg = sub { my ($lpkg, $rpkg) = @_; - my $c = ($lpkg->release =~ /mdv|mnb/ ? 1 : 0) - ($rpkg->release =~ /mdv|mnb/ ? 1 : 0); + my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg->release =~ /mdv|mnb|mga/ ? 1 : 0); if ($c) { prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c); $c; @@ -302,7 +302,7 @@ sub upgrading_redhat() { undef *URPM::Package::compare; *URPM::Package::compare = sub { my ($lpkg, $rpkg_ver) = @_; - my $c = ($lpkg->release =~ /mdv|mnb/ ? 1 : 0) - ($rpkg_ver =~ /mdv|mnb/ ? 1 : 0); + my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg_ver =~ /mdv|mnb|mga/ ? 1 : 0); if ($c) { prefering_mdv($lpkg, $rpkg_ver, $c); return $c; @@ -468,7 +468,7 @@ Consoles 1,3,4,7 may also contain interesting information"; harddrake::autoconf::cpufreq(); harddrake::autoconf::floppy(); - #- for mandrake_firstime + #- for mageia_firstime touch "$::prefix/var/lock/TMP_1ST"; fs::any::set_cdrom_symlink($o->{all_hds}{raw_hds}); @@ -832,7 +832,7 @@ sub exitInstall { eval { output "$::prefix/root/drakx/README", "This directory contains several installation-related files, mostly log files (very useful if you ever report a bug!). -Beware that some Mandriva Linux tools rely on the contents of some +Beware that some %s tools rely on the contents of some of these files... so remove any file from here at your own risk! " }; |