diff options
| author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-06 22:37:08 +0000 |
|---|---|---|
| committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-06 22:37:08 +0000 |
| commit | d9cc095760861d869d2e2ccf05f94454dad32f00 (patch) | |
| tree | ade69986b2f99e113c95009736399966d4a3d511 /perl-install/install/steps.pm | |
| parent | 368f416649ed34557702a946ec8c0cec2fd45294 (diff) | |
| download | drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar.gz drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar.bz2 drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar.xz drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.zip | |
Synthesized commit during git-svn import combining previous Mandriva history with Magiea.
This commit consitsts of the following subversion commits:
------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line
Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line
Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line
Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line
Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line
Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line
Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line
Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line
Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines
readd missing file
------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line
Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines
import cleaned rescue for Mageia
------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line
import (cleaned) doc
------------------------------------------------------------------------
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! " }; |