Changeset 2428 in ProjectBuilder

Timestamp:

Sep 2, 2019, 1:21:44 AM (5 years ago)

Author:

Bruno Cornec

Message:

use pbstep as variable name instead of pbforce incorrect here

File:

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

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

@@ -68 +68 @@
 
 my $v = shift;
-my $pbforce = shift;            # Which step are we in (0: create, 1: setup, 2: build, 3: use)
+my $pbstep = shift;         # Which step are we in (0: create, 1: setup, 2: build, 3: use)
 my $locsnap = shift;
 my $vetype = shift;
@@ -75 +75 @@
 my $docrepo = "";           # By default no repository for docker available
 
-pb_log(2,"Entering pb_ve_launch at step $pbforce for type $vetype\n");
+pb_log(2,"Entering pb_ve_launch at step $pbstep for type $vetype\n");
 # Get distro context
 my $pbos = pb_distro_get_context($v);
@@ -121 +121 @@
     my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
 
-    if (((((defined $verebuild) && (defined $verebuild->{$ENV{'PBPROJ'}}) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 0)) && ($vetype ne "docker"))
+    if (((((defined $verebuild) && (defined $verebuild->{$ENV{'PBPROJ'}}) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbstep == 0)) && ($vetype ne "docker"))
         # For docker we may have a reference image that we'll use
-        || (($vetype eq "docker") && ($pbforce == 0) && ((not defined $pbimage) || ($pbimage eq "")))) {
+        || (($vetype eq "docker") && ($pbstep == 0) && ((not defined $pbimage) || ($pbimage eq "")))) {
 
         my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
@@ -283 +283 @@
 
     # If docker, create the image and remove the now temp dir except if we had one already
-    if (($vetype eq "docker") && ($pbforce == 0)) {
+    if (($vetype eq "docker") && ($pbstep == 0)) {
         my $cmd1 = pb_check_req("docker",0);
         # step 0 : nothing at creation -> tag n-v-a (made below)