summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm.pm2
-rw-r--r--urpmi.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index df204f06..d12f28fb 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -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;
diff --git a/urpmi.spec b/urpmi.spec
index 844e4b47..c6ee56ba 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -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