diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-11 17:54:38 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-11 17:55:19 +0200 |
| commit | 60dc60edd72b1f97f801bf478fb2926ddf8a3749 (patch) | |
| tree | 87322244a128e0dd534fa5cc4c4e8d0e62ab4ab2 | |
| parent | 5840199151976f5bc8c4a60d252e45ad88918e1d (diff) | |
| download | drakx-60dc60edd72b1f97f801bf478fb2926ddf8a3749.tar drakx-60dc60edd72b1f97f801bf478fb2926ddf8a3749.tar.gz drakx-60dc60edd72b1f97f801bf478fb2926ddf8a3749.tar.bz2 drakx-60dc60edd72b1f97f801bf478fb2926ddf8a3749.tar.xz drakx-60dc60edd72b1f97f801bf478fb2926ddf8a3749.zip | |
fix selecting Plasma (mga#18687)
so that we matches the correct CAT_PLASMA5 in rpmsrate
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b1cce9854..9bdbcf8ab 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix selecting Plasma (mga#18687) + Version 17.36 - 11 June 2016 - do not override bootloader on upgrade (mga#18638) diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index e34d5bc53..0e82b444c 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -452,7 +452,7 @@ sub _chooseDesktop { my ($o, $rpmsrate_flags_chosen, $chooseGroups) = @_; my @l = group_by2( - KDE => N("Plasma"), + PLASMA5 => N("Plasma"), GNOME => N("GNOME"), Custom => N("Custom"), ); @@ -471,7 +471,7 @@ sub _chooseDesktop { } my $desktop = $choice->[0]; log::l("chosen Desktop: $desktop"); - my @desktops = ('KDE', 'GNOME'); + my @desktops = ('PLASMA5', 'GNOME'); if (member($desktop, @desktops)) { my ($want, $dontwant) = ($desktop, grep { $desktop ne $_ } @desktops); $rpmsrate_flags_chosen->{"CAT_$want"} = 1; |