Changeset 2234 in ProjectBuilder for devel/pb-modules
- Timestamp:
- Jun 27, 2017, 3:32:10 PM (7 years ago)
- Location:
- devel/pb-modules
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.conf.pod
r2156 r2234 167 167 Example: http_proxy default = http://example.com:3128/ 168 168 169 =item B<https_proxy> 170 171 Nature: Optional 172 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here. 173 Value: string indicating the proxy to use 174 Conffile: pb 175 Example: https_proxy default = http://example.com:3128/ 176 169 177 =item B<logcmd> 170 178 -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2222 r2234 322 322 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy")); 323 323 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy")); 324 my $https_proxy = pb_distro_get_param($pbos,pb_conf_get_if("https_proxy")); 324 325 325 326 # We do not overwrite shell settings 326 327 $ENV{ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne "")); 327 328 $ENV{http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne "")); 329 $ENV{https_proxy} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne "")); 328 330 } 329 331 … … 350 352 pb_log(1, "ftp_proxy=$ENV{ftp_proxy}\n") if (defined $ENV{ftp_proxy}); 351 353 pb_log(1, "http_proxy=$ENV{http_proxy}\n") if (defined $ENV{http_proxy}); 354 pb_log(1, "https_proxy=$ENV{https_proxy}\n") if (defined $ENV{https_proxy}); 352 355 353 356 # Get dependencies in the build file if not forced -
devel/pb-modules/lib/ProjectBuilder/VE.pm
r2233 r2234 96 96 if ($EFFECTIVE_USER_ID != 0) { 97 97 $sudocmd ="sudo "; 98 foreach my $proxy (qw/http_proxy ftp_proxy/) {98 foreach my $proxy (qw/http_proxy https_proxy ftp_proxy/) { 99 99 if (defined $ENV{$proxy}) { 100 100 open(CMD,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!"; … … 308 308 print DOCKER "ENV ftp_proxy $ENV{ftp_proxy}\n" if (defined $ENV{ftp_proxy}); 309 309 print DOCKER "ENV http_proxy $ENV{http_proxy}\n" if (defined $ENV{http_proxy}); 310 print DOCKER "ENV https_proxy $ENV{https_proxy}\n" if (defined $ENV{https_proxy}); 310 311 # We are root in that container so no need to sudo, which is present potentially 311 312 my $cmd2 = $pbos->{'install'};
Note:
See TracChangeset
for help on using the changeset viewer.