From 08a247213e33fd3e41981bf58706f554586117e9 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Fri, 13 Jan 2006 10:50:07 +0000
Subject: Remove force_local download option (which was always on)

---
 gurpmi2 | 2 --
 urpm.pm | 7 +------
 urpmi   | 2 --
 urpmq   | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/gurpmi2 b/gurpmi2
index 125bcb0b..6a87aa42 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -198,7 +198,6 @@ sub do_install_3 () {
     $vbox->pack_start($progressbar, 0, 0, 0);
     change_mainw($vbox);
     $urpm->copy_packages_of_removable_media($list, \%sources,
-	force_local => 1,
 	ask_for_medium => sub {
 	    my $w = Gtk2::MessageDialog->new($mainw, [qw(modal destroy-with-parent)], 'warning', 'ok-cancel',
 		N("Please insert the medium named \"%s\" on device [%s]", $_[0], $_[1])
@@ -225,7 +224,6 @@ sub do_install_3 () {
 	    limit_rate => $urpm->{options}{'limit-rate'},
 	    compress => $urpm->{options}{compress},
 	    resume => $urpm->{options}{resume},
-	    force_local => 1,
 	    callback => sub {
 		my ($mode, $file, $percent) = @_;
 		if ($mode eq 'start') {
diff --git a/urpm.pm b/urpm.pm
index 94512477..5a5ec4f5 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2781,12 +2781,7 @@ sub download_packages_of_distant_media {
 		    $error_sources->{$i} = $2;
 		}
 	    } elsif ($url =~ m!^([^:]*):/(.*/([^/]*\.rpm))\Z!) {
-		if ($options{force_local}) {
-		    #- will download now
-		    $distant_sources{$i} = "$1:/$2";
-		} else {
-		    $sources->{$i} = "$1:/$2";
-		}
+		$distant_sources{$i} = "$1:/$2"; #- will download now
 	    } else {
 		$urpm->{error}(N("malformed URL: [%s]", $url));
 	    }
diff --git a/urpmi b/urpmi
index 8f0af639..0687a85d 100755
--- a/urpmi
+++ b/urpmi
@@ -561,7 +561,6 @@ my %error_sources;
 $urpm->copy_packages_of_removable_media(
     $list, \%sources,
     verbose => $verbose > 0,
-    force_local => 1,
     ask_for_medium => (!$urpm->{options}{auto} || $allow_medium_change) && sub {
 	my $msg = N("Please insert the medium named \"%s\" on device [%s]", $_[0], $_[1]);
 	my $msg2 = N("Press Enter when ready...");
@@ -606,7 +605,6 @@ foreach my $set (@{$state->{transaction} || []}) {
 	limit_rate => $urpm->{options}{'limit-rate'},
 	compress => $urpm->{options}{compress},
 	resume => $urpm->{options}{resume},
-	force_local => 1,
 	callback => sub {
 	    my ($mode, $file, $percent, $total, $eta, $speed) = @_;
 	    goto &urpm::download::sync_logger;
diff --git a/urpmq b/urpmq
index 0caa7bb5..d6208fe4 100755
--- a/urpmq
+++ b/urpmq
@@ -331,7 +331,7 @@ if ($urpm::args::options{list_aliases}) {
 			};
 			$packer->extract($tmp_header_dir, @headers);
 		    } elsif (!%downloads) {
-			%downloads = $urpm->download_source_packages({}, $list, force_local => 1, nolock => $urpm::args::options{nolock});
+			%downloads = $urpm->download_source_packages({}, $list, nolock => $urpm::args::options{nolock});
 		    }
 		}
 	    }
-- 
cgit v1.2.1