Changeset 2287 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.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/VE.pm (modified) (4 diffs)

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);
 }