diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-12 10:18:42 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-12 10:18:42 +0000 |
| commit | 95fdbf2623ffb548630661cbee53ff52f1544e60 (patch) | |
| tree | 800c06c0140595830460d57ca3ba46209a622355 | |
| parent | 5af1271ab553aa62a3ef995d173a45e1907d8bd2 (diff) | |
| download | urpmi-95fdbf2623ffb548630661cbee53ff52f1544e60.tar urpmi-95fdbf2623ffb548630661cbee53ff52f1544e60.tar.gz urpmi-95fdbf2623ffb548630661cbee53ff52f1544e60.tar.bz2 urpmi-95fdbf2623ffb548630661cbee53ff52f1544e60.tar.xz urpmi-95fdbf2623ffb548630661cbee53ff52f1544e60.zip | |
fix problem with no proxy
(the "return" in get_proxy was returning an empty list which shifted the key/values of $urpm)
| -rw-r--r-- | urpm.pm | 2 | ||||
| -rw-r--r-- | urpmi.spec | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -137,7 +137,7 @@ sub get_proxy { }; local (*F, $_); # open F, "$ENV{HOME}/.wgetrc" or return; - open F, "/etc/urpmi/proxy.cfg" or return; + open F, "/etc/urpmi/proxy.cfg" or return undef; while (<F>) { chomp; s/#.*$//; s/^\s*//; s/\s*$//; /^http_proxy\s*=\s*(.*)$/ and $proxy->{http_proxy} = $1, next; @@ -2,7 +2,7 @@ Name: urpmi Version: 3.7 -Release: 3mdk +Release: 4mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -144,6 +144,9 @@ fi %changelog +* Fri Jul 12 2002 Pixel <pixel@mandrakesoft.com> 3.7-4mdk +- fix problem with no proxy + * Thu Jul 11 2002 François Pons <fpons@mandrakesoft.com> 3.7-3mdk - incorporated proxy patch of Andre Duclos <shirka@wanadoo.fr>. - added tempory error message (before message and translation are |