From dc3a0f8dfb28da90b149134516895fcbe3e3fa5d Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 16 Jul 2002 10:00:58 +0000
Subject: fixed missing upgrade. added wait message when finding packages to
 upgrade.

---
 perl-install/install_steps_interactive.pm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 63387c35f..46ee8ab6c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -477,15 +477,19 @@ sub formatMountPartitions {
 
 #------------------------------------------------------------------------------
 sub setPackages {
-    my ($o) = @_;
-    my $w = $o->wait_message('', _("Looking for available packages..."));
-    $o->SUPER::setPackages;
-}
-#------------------------------------------------------------------------------
-sub selectPackagesToUpgrade {
-    my ($o) = @_;
-    my $w = $o->wait_message('', _("Finding packages to upgrade..."));
-    $o->SUPER::selectPackagesToUpgrade();
+    my ($o, $rebuild_needed) = @_;
+
+    my $w = $o->wait_message('', $rebuild_needed ? _("Looking for available packages and rebuilding rpm database...") :
+			     _("Looking for available packages..."));
+    install_any::setPackages($o, $rebuild_needed);
+
+    if ($rebuild_needed) {
+	$w->set(_("Finding packages to upgrade..."));
+	pkgs::selectPackagesToUpgrade($o->{packages}, $o->{prefix}, $o->{base}, $o->{toRemove}, $o->{toSave});
+    } else {
+	$w->set(_("Looking at packages already installed..."));
+	pkgs::selectPackagesAlreadyInstalled($o->{packages}, $o->{prefix});
+    }
 }
 #------------------------------------------------------------------------------
 sub choosePackages {
@@ -509,8 +513,10 @@ sub choosePackages {
     my $b = pkgs::saveSelected($packages);
     pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $def_mark, 0);
     my $def_size = pkgs::selectedSize($packages) + 1; #- avoid division by zero.
+    log::l("default size (level $def_mark) is : " . formatXiB($def_size));
     my $level = pkgs::setSelectedFromCompssList($packages, { map { $_ => 1 } map { @{$compssUsers->{$_}{flags}} } @{$o->{compssUsersSorted}} }, $min_mark, 0);
     my $max_size = pkgs::selectedSize($packages) + 1; #- avoid division by zero.
+    log::l("max size (level $min_mark) is : " . formatXiB($def_size));
     pkgs::restoreSelected($b);
 
     $o->chooseGroups($packages, $compssUsers, $min_mark, \$individual, $max_size) if !$::corporate;
-- 
cgit v1.2.1