Changeset 2428


Ignore:
Timestamp:
Sep 2, 2019, 1:21:44 AM (7 weeks ago)
Author:
bruno
Message:

use pbstep as variable name instead of pbforce incorrect here

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/VE.pm

    r2333 r2428  
    6868
    6969my $v = shift;
    70 my $pbforce = shift;            # Which step are we in (0: create, 1: setup, 2: build, 3: use)
     70my $pbstep = shift;         # Which step are we in (0: create, 1: setup, 2: build, 3: use)
    7171my $locsnap = shift;
    7272my $vetype = shift;
     
    7575my $docrepo = "";           # By default no repository for docker available
    7676
    77 pb_log(2,"Entering pb_ve_launch at step $pbforce for type $vetype\n");
     77pb_log(2,"Entering pb_ve_launch at step $pbstep for type $vetype\n");
    7878# Get distro context
    7979my $pbos = pb_distro_get_context($v);
     
    121121    my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
    122122
    123     if (((((defined $verebuild) && (defined $verebuild->{$ENV{'PBPROJ'}}) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 0)) && ($vetype ne "docker"))
     123    if (((((defined $verebuild) && (defined $verebuild->{$ENV{'PBPROJ'}}) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbstep == 0)) && ($vetype ne "docker"))
    124124        # For docker we may have a reference image that we'll use
    125         || (($vetype eq "docker") && ($pbforce == 0) && ((not defined $pbimage) || ($pbimage eq "")))) {
     125        || (($vetype eq "docker") && ($pbstep == 0) && ((not defined $pbimage) || ($pbimage eq "")))) {
    126126
    127127        my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
     
    283283
    284284    # If docker, create the image and remove the now temp dir except if we had one already
    285     if (($vetype eq "docker") && ($pbforce == 0)) {
     285    if (($vetype eq "docker") && ($pbstep == 0)) {
    286286        my $cmd1 = pb_check_req("docker",0);
    287287        # step 0 : nothing at creation -> tag n-v-a (made below)
Note: See TracChangeset for help on using the changeset viewer.