summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-02 10:58:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-02 10:58:38 +0000
commitc3b9336d935188f5f518f51a1eaf9e1cbc9ea946 (patch)
treea13f1dc93201377e5ba36ecae55895c47ec0fa7a
parentbf902e6b84019fcd8ea25339f545b710f05351f4 (diff)
downloaddrakx-c3b9336d935188f5f518f51a1eaf9e1cbc9ea946.tar
drakx-c3b9336d935188f5f518f51a1eaf9e1cbc9ea946.tar.gz
drakx-c3b9336d935188f5f518f51a1eaf9e1cbc9ea946.tar.bz2
drakx-c3b9336d935188f5f518f51a1eaf9e1cbc9ea946.tar.xz
drakx-c3b9336d935188f5f518f51a1eaf9e1cbc9ea946.zip
we want the release extension
-rw-r--r--perl-install/install_steps_interactive.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e5757c0c7..f6aafcd86 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -174,7 +174,10 @@ sub selectInstallClass {
}
$o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
- $o->{upgrade_by_removing_pkgs} ||= member($o->{isUpgrade}, 'conectiva', 'redhat');
+ $o->{upgrade_by_removing_pkgs_matching} ||= {
+ conectiva => 'cl',
+ redhat => '.', #- everything!
+ }->{$o->{isUpgrade}};
log::l("upgrading $o->{isUpgrade} distribution" . ($o->{upgrade_by_removing_pkgs} ? " (upgrade_by_removing_pkgs)" : ''));
}
}