Changeset 2287 in ProjectBuilder for devel/pb-modules

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'

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (2 diffs)
• Distribution.pm (modified) (3 diffs)
• Env.pm (modified) (2 diffs)
• VE.pm (modified) (4 diffs)

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

@@ -578 +578 @@
 =item B<pb_path_expand>
 
-Expand out a path by environment variables as ($ENV{XXX}) and ~
+Expand out a path by environment variables as ($ENV{'ENVVAR'}) and ~
 
 =cut
@@ -587 +587 @@
 
 eval { $path =~ s/(\$ENV.+\})/$1/eeg; };
-$path =~ s/^\~/$ENV{HOME}/;
+$path =~ s/^\~/$ENV{'HOME'}/;
 
 return($path);

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;

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

@@ -274 +274 @@
 }
 # Expand potential env variable in it
-$ENV{PBDEFDIR} = pb_path_expand($ENV{PBDEFDIR});
+$ENV{'PBDEFDIR'} = pb_path_expand($ENV{'PBDEFDIR'});
 pb_log(1,"PBDEFDIR: $ENV{'PBDEFDIR'}\n");
 
@@ -293 +293 @@
     }
 }
-$ENV{PBPROJDIR} = pb_path_expand($ENV{PBPROJDIR});
+$ENV{'PBPROJDIR'} = pb_path_expand($ENV{'PBPROJDIR'});
 
 my $pbconfpath = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";

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

@@ -110 +110 @@
 $sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
 
-my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
+my $root = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
     
 if (($vetype eq "chroot") || ($vetype eq "schroot") || ($vetype eq "docker")) {
@@ -132 +132 @@
             # Which tool is used
             my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
-            die "No verpmtype defined for $ENV{PBPROJ}" unless (defined $verpmstyle);
+            die "No verpmtype defined for $ENV{'PBPROJ'}" unless (defined $verpmstyle);
     
             # Get potential rbs option
@@ -306 +306 @@
             print DOCKER "FROM $pbimage\n";
             print DOCKER "MAINTAINER project-builder.org aka pb\n";
-            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});
+            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'};
@@ -410 +410 @@
     $vetype = $ptr->{$ENV{'PBPROJ'}};
 }
-confess "No vetype defined for $ENV{PBPROJ}" unless (defined $vetype);
-pb_log(1, "Using vetype $vetype for $ENV{PBPROJ}\n");
+confess "No vetype defined for $ENV{'PBPROJ'}" unless (defined $vetype);
+pb_log(1, "Using vetype $vetype for $ENV{'PBPROJ'}\n");
 return($vetype);
 }