Changeset 2287 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Sep 4, 2017, 1:21:18 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix usage of labels in env var (normalize with 'LABEL'

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

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

@@ -333 +333 @@
 
 # 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 ""));
+$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 ""));
 }
 
@@ -358 +358 @@
 confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
 pb_apply_conf_proxy($pbos);
-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});
+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
@@ -497 +497 @@
 my $deps2 = "";
 # Avoid to install what is already there
-delete $ENV{COLUMNS};
+delete $ENV{'COLUMNS'};
 foreach my $p (split(/\s+/,$deps)) {
     next if $p =~ /^\s*$/o;