Changeset 1907 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm

Timestamp:

Oct 10, 2014, 11:32:12 AM (10 years ago)

Author:

Bruno Cornec

Message:

Fix some default initializations (

undef e.g.)

• VE.pm doesn't need to have pbstep (use pbforce simply)
• Fix sbx2setupve in a docker context
• Add entries for prepve|vm|rm
• Move sandbox management into send2target so that all files to process are managed here

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (8 diffs)

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

@@ -68 +68 @@
 
 my $v = shift;
-my $pbscript = shift;
-my $pbforce = shift;    
-my $pbstep= shift;          # Which step are we in (0: create, 1: setup, 2: build, 3: use)
+my $pbforce = shift;            # Which step are we in (0: create, 1: setup, 2: build, 3: use)
 my $locsnap = shift;
 my $vetype = shift;
@@ -78 +76 @@
 my $docrepo = undef;            # By default no repository for docker available
 
-pb_log(2,"Entering pb_ve_launch at step $pbstep\n");
+pb_log(2,"Entering pb_ve_launch at step $pbforce for type $vetype\n");
 # Get distro context
 my $pbos = pb_distro_get_context($v);
@@ -128 +126 @@
     my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
     
-    if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) && ($vetype ne "docker"))
+    if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 0)) && ($vetype ne "docker"))
         # For docker we may have a reference image that we'll use
-        || (($vetype eq "docker") && ($pbstep == 0))) {
+        || (($vetype eq "docker") && ($pbforce == 0))) {
 
         my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
@@ -288 +286 @@
 
     # If docker, create the image and remove the now temp dir except if we had one already
-    if (($vetype eq "docker") && ($pbstep == 0)) {
+    if (($vetype eq "docker") && ($pbforce == 0)) {
         $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
         my $cmd1 = pb_check_req("docker",0);
@@ -348 +346 @@
 sub pb_ve_docker_registry {
 
-my $dockerreg = shift || undef;
+my $dockerreg = shift;
 my $wget = pb_check_req("wget",0);
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
@@ -369 +367 @@
 sub pb_ve_docker_repo {
 
-my $dockerreg = shift || undef;
+my $dockerreg = shift;
 my $docrepo = "";
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
@@ -380 +378 @@
 sub pb_ve_docker_get_image {
 
-my $pbimage = shift || undef;
+my $pbimage = shift;
 my $found = 0;
 
@@ -398 +396 @@
 sub pb_ve_get_type {
 
-my $vetype = shift || undef;
+my $vetype = shift;
 
 # Get VE context