summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-26 08:23:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-26 08:23:38 +0000
commit4dddc4a5eaa997cfd947ae89cf4e4e98ef13f1ce (patch)
treed6a42e3681bd03a2187ab86d7e926ef42ac2e62c
parent01fceac054716dc61003d3c68946b92ec438a87f (diff)
downloaddrakx-4dddc4a5eaa997cfd947ae89cf4e4e98ef13f1ce.tar
drakx-4dddc4a5eaa997cfd947ae89cf4e4e98ef13f1ce.tar.gz
drakx-4dddc4a5eaa997cfd947ae89cf4e4e98ef13f1ce.tar.bz2
drakx-4dddc4a5eaa997cfd947ae89cf4e4e98ef13f1ce.tar.xz
drakx-4dddc4a5eaa997cfd947ae89cf4e4e98ef13f1ce.zip
- do not ask desktop choice in upgrade (#34025)
(typo fix)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9a0d2e96d..553e24688 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not ask desktop choice in upgrade (#34025)
+
Version 10.4.212 - 21 September 2007, by Thierry Vignaud
- don't crash install when mounting CD fails (#33421)
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 48246de7a..8f5153e10 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -365,7 +365,7 @@ sub choosePackages {
my $min_mark = 4;
my ($individual, $chooseGroups);
- if (!$o->{upgrade}) {
+ if (!$o->{isUpgrade}) {
if (install::pkgs::packageByName($o->{packages}, 'task-kde') &&
install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal')) {
_chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups);