From 6360c62be36ded17dd21090ce3136dc49bee1cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Fri, 20 Apr 2007 23:09:01 +0000 Subject: [PATCH] The http_proxy environment variable is also used by curl and other utilities --- pisi/configfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/configfile.py b/pisi/configfile.py index cadaa0b8..cccca1d4 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -62,9 +62,9 @@ class GeneralDefaults: autoclean = False distribution = "Pardus" distribution_release = "2007" - http_proxy = os.getenv("HTTP_PROXY") or None - https_proxy = os.getenv("HTTPS_PROXY") or None - ftp_proxy = os.getenv("FTP_PROXY") or None + http_proxy = (os.getenv("http_proxy") or os.getenv("HTTP_PROXY")) or None + https_proxy = (os.getenv("https_proxy") or os.getenv("HTTPS_PROXY")) or None + ftp_proxy = (os.getenv("ftp_proxy") or os.getenv("FTP_PROXY")) or None class BuildDefaults: """Default values for [build] section"""