Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24337/perlmod/Fink
Modified Files:
PkgVersion.pm Engine.pm ChangeLog
Log Message:
Set proxy env vars before calling apt-get. Fixes bug #2040507
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -d -r1.420 -r1.421
--- Engine.pm 13 Nov 2008 05:53:47 -0000 1.420
+++ Engine.pm 24 Dec 2008 14:42:38 -0000 1.421
@@ -678,6 +678,17 @@
} elsif ($config->verbosity_level < 2) {
$aptcmd .= " -q";
}
+ # set proxy env vars
+ my $http_proxy = $config->param_default("ProxyHTTP", "");
+ if ($http_proxy) {
+ $ENV{http_proxy} = $http_proxy;
+ $ENV{HTTP_PROXY} = $http_proxy;
+ }
+ my $ftp_proxy = $config->param_default("ProxyFTP", "");
+ if ($ftp_proxy) {
+ $ENV{ftp_proxy} = $ftp_proxy;
+ $ENV{FTP_PROXY} = $ftp_proxy;
+ }
if (&execute($aptcmd . " update", quiet => $quiet)) {
print("WARNING: Failure while updating indexes.\n");
return 0;
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -d -r1.612 -r1.613
--- PkgVersion.pm 18 Dec 2008 16:25:21 -0000 1.612
+++ PkgVersion.pm 24 Dec 2008 14:42:38 -0000 1.613
@@ -3048,6 +3048,17 @@
join(' ', map {
sprintf "%s=%s", $_->get_name(), $_->get_fullversion
} @packages);
+ # set proxy env vars
+ my $http_proxy = $config->param_default("ProxyHTTP", "");
+ if ($http_proxy) {
+ $ENV{http_proxy} = $http_proxy;
+ $ENV{HTTP_PROXY} = $http_proxy;
+ }
+ my $ftp_proxy = $config->param_default("ProxyFTP", "");
+ if ($ftp_proxy) {
+ $ENV{ftp_proxy} = $ftp_proxy;
+ $ENV{FTP_PROXY} = $ftp_proxy;
+ }
if (&execute($aptcmd)) {
# print "\n";
# &print_breaking("Downloading '".$self->get_debname()."' failed.
".
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1571
retrieving revision 1.1572
diff -u -d -r1.1571 -r1.1572
--- ChangeLog 19 Dec 2008 17:54:45 -0000 1.1571
+++ ChangeLog 24 Dec 2008 14:42:38 -0000 1.1572
@@ -1,3 +1,8 @@
+2008-12-24 Sebastien Maret <[email protected]>
+
+ * Engine.pm, PkgVersion.pm: Set proxy env vars before calling
+ apt-get. Fixes bug #2040507
+
2008-12-19 Daniel Macks <[email protected]>
* Validation.pm: Warn for older (not MD5-protected) patch syntaxes
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
