summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-01-02 22:48:52 -0600
committerDan McGee <dan@archlinux.org>2009-01-02 22:48:52 -0600
commitf8b689d48eb34cf81c22c854cd83595338d49d44 (patch)
treedc45d9e3638581640ac5bd131529b8c2754b1143 /lib
parentbd628274cc8db81704860e69894fcd217c2068d0 (diff)
parentc31fcfd833fc527a3774c7b1bc29686194d23942 (diff)
downloadpacman-f8b689d48eb34cf81c22c854cd83595338d49d44.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/dload.c po/it.po scripts/makepkg.sh.in
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/dload.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 9934f30a..06f643f7 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -144,6 +144,12 @@ static int download_internal(const char *url, const char *localpath,
dl_thisfile = 0;
}
+ /* print proxy info for debug purposes */
+ _alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY"));
+ _alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy"));
+ _alpm_log(PM_LOG_DEBUG, "FTP_PROXY: %s\n", getenv("FTP_PROXY"));
+ _alpm_log(PM_LOG_DEBUG, "ftp_proxy: %s\n", getenv("ftp_proxy"));
+
/* libfetch does not reset the error code */
fetchLastErrCode = 0;