From f1861b083972db049e61385b2170f2e60a7f0b53 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 17 Sep 2002 16:01:46 +0000
Subject: 4.0-20mdk

---
 inst.list  | 13 ++++++++++++-
 urpm.pm    |  8 ++++----
 urpmi.spec |  5 ++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/inst.list b/inst.list
index ae91e2b5..348ad816 100644
--- a/inst.list
+++ b/inst.list
@@ -1 +1,12 @@
-# Here you can specify the package you want to install and not upgrade
+# Here you can specify packages that need to be installed instead
+# of being upgraded (typically kernel packages).
+kernel
+kernel-smp
+kernel-secure
+kernel-enterprise
+kernel-linus2.2
+kernel-linus2.4
+kernel22
+kernel22-secure
+kernel22-smp
+hackkernel
diff --git a/urpm.pm b/urpm.pm
index c6d6d88e..5f5e0f44 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -161,7 +161,7 @@ sub set_proxy {
 	    /wget/ && do {
 		for ($proxy->{proxy}) {
 		    if (defined $_->{http_proxy}) {
-			$ENV{http_proxy} = $_->{http_proxy} =~ /^http:\/\// ? $_->{http_proxy} : "http://$_->{http_proxy}";
+			$ENV{http_proxy} = $_->{http_proxy} =~ /^http:/ ? $_->{http_proxy} : "http://$_->{http_proxy}";
 		    }
 		    $ENV{ftp_proxy} = $_->{ftp_proxy} if defined $_->{ftp_proxy};
 		    @res = ("--proxy-user=$_->{user}", "--proxy-passwd=$_->{pwd}") if defined $_->{user} && defined $_->{pwd};
@@ -170,9 +170,9 @@ sub set_proxy {
 	    };
 	    /curl/ && do {
 		for ($proxy->{proxy}) {
-		    push @res, "-x $_->{http_proxy}" if defined $_->{http_proxy};
-		    push @res, "-x $_->{ftp_proxy}" if defined $_->{ftp_proxy};
-		    push @res, "-U $_->{user}:$_->{pwd}" if defined $_->{user} && defined $_->{pwd};
+		    push @res, ('-x', $_->{http_proxy}) if defined $_->{http_proxy};
+		    push @res, ('-x', $_->{ftp_proxy}) if defined $_->{ftp_proxy};
+		    push @res, ('-U', "$_->{user}:$_->{pwd}") if defined $_->{user} && defined $_->{pwd};
 		}
 		last;
 	    };
diff --git a/urpmi.spec b/urpmi.spec
index 5cb061a4..99e835f8 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.0
-Release: 19mdk
+Release: 20mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -202,6 +202,9 @@ fi
 
 
 %changelog
+* Tue Sep 17 2002 François Pons <fpons@mandrakesoft.com> 4.0-20mdk
+- gc: fixed curl proxy management.
+
 * Mon Sep 16 2002 François Pons <fpons@mandrakesoft.com> 4.0-19mdk
 - fixed possible problem with http proxy for wget.
 - umount removable device automatically mounted.
-- 
cgit v1.2.1