summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-07-15 17:54:50 +0000
committerFrancois Pons <fpons@mandriva.com>2002-07-15 17:54:50 +0000
commit13ac5c963e1715979ef7b1a055e947def5135873 (patch)
tree2ae30dcff31d62e72c7c7cc182214bf34eed15df /perl-install
parent054e9de99f363d6b1e5c6f10bf9af673bf3ec313 (diff)
downloaddrakx-13ac5c963e1715979ef7b1a055e947def5135873.tar
drakx-13ac5c963e1715979ef7b1a055e947def5135873.tar.gz
drakx-13ac5c963e1715979ef7b1a055e947def5135873.tar.bz2
drakx-13ac5c963e1715979ef7b1a055e947def5135873.tar.xz
drakx-13ac5c963e1715979ef7b1a055e947def5135873.zip
fixed flag usage (still check selected package to upgrade but already selected
are correctly shown).
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_gtk.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 0253cdf07..5cfb557d2 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -348,9 +348,9 @@ sub choosePackagesTree {
node_state => sub {
my $p = pkgs::packageByName($packages,$_[0]) or return;
pkgs::packageMedium($packages, $p)->{selected} or return;
- $p->flag_base and return 'base';
- $p->flag_installed and return 'installed';
- $p->flag_selected and return 'selected';
+ $p->flag_base and return 'base';
+ $p->flag_installed && !$p->flag_upgrade and return 'installed';
+ $p->flag_selected and return 'selected';
return 'unselected';
},
build_tree => sub {
@@ -442,7 +442,7 @@ sub choosePackagesTree {
my $p = pkgs::packageByName($packages, $_[0]) or return;
if ($p->flag_base) {
$o->ask_warn('', _("This is a mandatory package, it can't be unselected"));
- } elsif ($p->flag_installed) {
+ } elsif ($p->flag_installed && !$p->flag_upgrade) {
$o->ask_warn('', _("You can't unselect this package. It is already installed"));
} elsif ($p->flag_selected && $p->flag_installed) {
if ($::expert) {