From 848081d301fc9c565c3bc5e1e938811b04769406 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 1 Sep 2008 09:13:25 +0000
Subject: - if network access, configure urpmi with --mirrorlist --distrib,  
 and install updates. This replaces the previous "Install Updates" step.

- this calls gurpmi.addmedia/urpmi.addmedia and gurpmi2/urpmi in chroot
- we do not allow anymore to choose which updates are going to be updated
  (ie choosePackagesTree is not used for this anymore)
---
 perl-install/install/steps_gtk.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'perl-install/install/steps_gtk.pm')

diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 4a66000c6..372a7ed30 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -328,7 +328,7 @@ sub reallyChooseGroups {
 }
 
 sub choosePackagesTree {
-    my ($o, $packages, $o_limit_medium) = @_;
+    my ($o, $packages) = @_;
 
     my $available = install::any::getAvailableSpace($o);
     my $availableCorrected = install::pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
@@ -351,7 +351,6 @@ sub choosePackagesTree {
 				my ($add_node, $flat) = @_;
 				if ($flat) {
 				    foreach (sort map { $_->name }
-					     grep { !$o_limit_medium || install::pkgs::packageMedium($packages, $_) == $o_limit_medium }
 					     grep { $_ && $_->arch ne 'src' }
 					     @{$packages->{depslist}}) {
 					$add_node->($_, undef);
@@ -361,7 +360,6 @@ sub choosePackagesTree {
 					my (@firstchoice, @others);
 					my %fl = map { ("CAT_$_" => 1) } @{$root->{flags}};
 					foreach my $p (@{$packages->{depslist}}) {
-					    !$o_limit_medium || install::pkgs::packageMedium($packages, $p) == $o_limit_medium or next;
 					    my @flags = $p->rflags;
 					    next if !($p->rate && any { any { !/^!/ && $fl{$_} } split('\|\|') } @flags);
 					    $p->rate >= 3 ?
@@ -489,7 +487,6 @@ sub choosePackagesTree {
 				     ],
 			    state => {
 				      auto_deps => 1,
-				      flat      => $o_limit_medium,
 				     },
 			  };
 
-- 
cgit v1.2.1