Changeset 2287 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm
- Timestamp:
- Sep 4, 2017, 1:21:18 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/VE.pm
r2234 r2287 110 110 $sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64')); 111 111 112 my $root = pb_path_expand($vepath->{$ENV{ PBPROJ}});112 my $root = pb_path_expand($vepath->{$ENV{'PBPROJ'}}); 113 113 114 114 if (($vetype eq "chroot") || ($vetype eq "schroot") || ($vetype eq "docker")) { … … 132 132 # Which tool is used 133 133 my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}}; 134 die "No verpmtype defined for $ENV{ PBPROJ}" unless (defined $verpmstyle);134 die "No verpmtype defined for $ENV{'PBPROJ'}" unless (defined $verpmstyle); 135 135 136 136 # Get potential rbs option … … 306 306 print DOCKER "FROM $pbimage\n"; 307 307 print DOCKER "MAINTAINER project-builder.org aka pb\n"; 308 print DOCKER "ENV ftp_proxy $ENV{ ftp_proxy}\n" if (defined $ENV{ftp_proxy});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});308 print DOCKER "ENV ftp_proxy $ENV{'ftp_proxy'}\n" if (defined $ENV{'ftp_proxy'}); 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'}); 311 311 # We are root in that container so no need to sudo, which is present potentially 312 312 my $cmd2 = $pbos->{'install'}; … … 410 410 $vetype = $ptr->{$ENV{'PBPROJ'}}; 411 411 } 412 confess "No vetype defined for $ENV{ PBPROJ}" unless (defined $vetype);413 pb_log(1, "Using vetype $vetype for $ENV{ PBPROJ}\n");412 confess "No vetype defined for $ENV{'PBPROJ'}" unless (defined $vetype); 413 pb_log(1, "Using vetype $vetype for $ENV{'PBPROJ'}\n"); 414 414 return($vetype); 415 415 }
Note:
See TracChangeset
for help on using the changeset viewer.