Changeset 2287 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm
- Timestamp:
- Sep 4, 2017, 1:21:18 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2279 r2287 333 333 334 334 # We do not overwrite shell settings 335 $ENV{ ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));336 $ENV{ http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));337 $ENV{ https_proxy} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne ""));335 $ENV{'ftp_proxy'} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne "")); 336 $ENV{'http_proxy'} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne "")); 337 $ENV{'https_proxy'} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne "")); 338 338 } 339 339 … … 358 358 confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/); 359 359 pb_apply_conf_proxy($pbos); 360 pb_log(1, "ftp_proxy=$ENV{ ftp_proxy}\n") if (defined $ENV{ftp_proxy});361 pb_log(1, "http_proxy=$ENV{ http_proxy}\n") if (defined $ENV{http_proxy});362 pb_log(1, "https_proxy=$ENV{ https_proxy}\n") if (defined $ENV{https_proxy});360 pb_log(1, "ftp_proxy=$ENV{'ftp_proxy'}\n") if (defined $ENV{'ftp_proxy'}); 361 pb_log(1, "http_proxy=$ENV{'http_proxy'}\n") if (defined $ENV{'http_proxy'}); 362 pb_log(1, "https_proxy=$ENV{'https_proxy'}\n") if (defined $ENV{'https_proxy'}); 363 363 364 364 # Get dependencies in the build file if not forced … … 497 497 my $deps2 = ""; 498 498 # Avoid to install what is already there 499 delete $ENV{ COLUMNS};499 delete $ENV{'COLUMNS'}; 500 500 foreach my $p (split(/\s+/,$deps)) { 501 501 next if $p =~ /^\s*$/o;
Note:
See TracChangeset
for help on using the changeset viewer.