summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-02 10:12:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-02 10:12:19 +0000
commit238de8bebea9234f98be499d1526424b1ed956a3 (patch)
tree670a2ca774dac91dcbe43c1dce6afedc61679372 /perl-install
parent378514ee00bb42b293a263ce67e93b5738d9cb6e (diff)
downloaddrakx-238de8bebea9234f98be499d1526424b1ed956a3.tar
drakx-238de8bebea9234f98be499d1526424b1ed956a3.tar.gz
drakx-238de8bebea9234f98be499d1526424b1ed956a3.tar.bz2
drakx-238de8bebea9234f98be499d1526424b1ed956a3.tar.xz
drakx-238de8bebea9234f98be499d1526424b1ed956a3.zip
set {upgrade_by_removing_pkgs} when upgrading conectiva and redhat
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2c350ef16..e5757c0c7 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -174,7 +174,8 @@ sub selectInstallClass {
}
$o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
- log::l("upgrading $o->{isUpgrade} distribution");
+ $o->{upgrade_by_removing_pkgs} ||= member($o->{isUpgrade}, 'conectiva', 'redhat');
+ log::l("upgrading $o->{isUpgrade} distribution" . ($o->{upgrade_by_removing_pkgs} ? " (upgrade_by_removing_pkgs)" : ''));
}
}
}