Changeset 1646 in ProjectBuilder

Timestamp:

Sep 27, 2012, 2:26:37 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Really use snapshot for launchve when needed. fix some parts of the condition which were wrong.

File:

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

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

@@ -68 +68 @@
 my $v = shift || undef;
 my $pbforce = shift || 0;       # By default do not rebuild VE
-my $pbsnap = shift || 0;        # By default do not snap VE
+my $locsnap = shift || 0;       # By default do not snap VE
 
 # Get distro context
@@ -253 +253 @@
     if ((-f "$root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz") &&
     (((defined $vesnap->{$v}) && ($vesnap->{$v} =~ /true/i)) ||
-        ((defined $vesnap->{$ENV{'PBPROJ'}}) && ($vesnap->{$ENV{'PBPROJ'}} =~ /true/i)) ||
-        ($pbsnap eq 1) ||
-        (! -d "$root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}"))) {
+        ((defined $vesnap->{$ENV{'PBPROJ'}}) && ($vesnap->{$ENV{'PBPROJ'}} =~ /true/i))) &&
+        ($locsnap eq 1) &&
+        (! -d "$root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}")) {
             my $cmd1 = pb_check_req("rm",0);
             my $cmd2 = pb_check_req("mkdir",0);