Changeset 2234 in ProjectBuilder for devel/pb-modules

Timestamp:

Jun 27, 2017, 3:32:10 PM (7 years ago)

Author:

Bruno Cornec

Message:

Adds https_proxy support

Location:

devel/pb-modules

Files:

• etc/pb.conf.pod (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• lib/ProjectBuilder/VE.pm (modified) (2 diffs)

devel/pb-modules/etc/pb.conf.pod

@@ -167 +167 @@
  Example: http_proxy default = http://example.com:3128/
 
+=item B<https_proxy>
+
+ Nature: Optional
+ 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.
+ Value: string indicating the proxy to use
+ Conffile: pb
+ Example: https_proxy default = http://example.com:3128/
+
 =item B<logcmd>
 

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -322 +322 @@
 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
+my $https_proxy = pb_distro_get_param($pbos,pb_conf_get_if("https_proxy"));
 
 # We do not overwrite shell settings
 $ENV{ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
 $ENV{http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
+$ENV{https_proxy} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne ""));
 }
 
@@ -350 +352 @@
 pb_log(1, "ftp_proxy=$ENV{ftp_proxy}\n") if (defined $ENV{ftp_proxy});
 pb_log(1, "http_proxy=$ENV{http_proxy}\n")  if (defined $ENV{http_proxy});
+pb_log(1, "https_proxy=$ENV{https_proxy}\n")  if (defined $ENV{https_proxy});
 
 # Get dependencies in the build file if not forced

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -96 +96 @@
 if ($EFFECTIVE_USER_ID != 0) {
     $sudocmd ="sudo ";
-    foreach my $proxy (qw/http_proxy ftp_proxy/) {
+    foreach my $proxy (qw/http_proxy https_proxy ftp_proxy/) {
         if (defined $ENV{$proxy}) {
             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});
             print DOCKER "ENV http_proxy $ENV{http_proxy}\n" if (defined $ENV{http_proxy});
+            print DOCKER "ENV https_proxy $ENV{https_proxy}\n" if (defined $ENV{https_proxy});
             # We are root in that container so no need to sudo, which is present potentially
             my $cmd2 = $pbos->{'install'};