diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-19 08:11:42 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-19 08:11:42 +0000 |
| commit | 4121a86a6bce3fc0e4f86c2a2daadd16aed10e3e (patch) | |
| tree | 4b621cfb008e6486b6a4fd21384c374dc4d74efa | |
| parent | a62b96c5282cd9d80c4c79498f13fc3aa97555ad (diff) | |
| download | drakx-backup-do-not-use-4121a86a6bce3fc0e4f86c2a2daadd16aed10e3e.tar drakx-backup-do-not-use-4121a86a6bce3fc0e4f86c2a2daadd16aed10e3e.tar.gz drakx-backup-do-not-use-4121a86a6bce3fc0e4f86c2a2daadd16aed10e3e.tar.bz2 drakx-backup-do-not-use-4121a86a6bce3fc0e4f86c2a2daadd16aed10e3e.tar.xz drakx-backup-do-not-use-4121a86a6bce3fc0e4f86c2a2daadd16aed10e3e.zip | |
no_comment
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 56f6087e5..aaa8a0a9f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -330,7 +330,7 @@ Consoles 1,3,4,7 may also contain interesting information"; #- call update-menus at the end of package installation { - local $ENV{DURING_INSTALL}; undef $ENV{DURING_INSTALL}; + local $ENV{DURING_INSTALL}; delete $ENV{DURING_INSTALL}; run_program::rooted($o->{prefix}, "update-menus"); } diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 691af9a2e..0292050d4 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -299,7 +299,6 @@ sub chooseSizeToInstall { my $enough = $available > $max_size_; my $max_size = min($max_size_, $available * 0.9); my $percentage = int 100 * $max_size / $max_size_; - print "$min_size, $max_size_, $available, $max_size\n"; #- don't ask anything if the difference between min and max is too small # return $max_size if $min_size && $max_size / $min_size < 1.01; @@ -459,8 +458,9 @@ sub choosePackagesTree { } else { my $p = $packages->[0]{$curr} or return; if (pkgs::packageFlagBase($p)) { - $o->ask_warn('', _("This is a mandatory package, it can't be unselected")); - return; + return $o->ask_warn('', _("This is a mandatory package, it can't be unselected")); + } elsif (pkgs::packageFlagInstalled($p)) { + return $o->ask_warn('', _("You can't unselect this package. It is already installed")); } pkgs::togglePackageSelection($packages, $p, my $l = {}); if (my @l = grep { $l->{$_} } keys %$l) { @@ -473,7 +473,7 @@ sub choosePackagesTree { } &$update_size; } else { - $o->ask_warn('', _("You can't unselect this package")); + $o->ask_warn('', _("You can't select/unselect this package")); } } }; |