Changeset 897 in ProjectBuilder

Timestamp:

Nov 10, 2009, 1:23:15 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Improve some testver usages and fix #51. Now passing false to testver works

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -545 +545 @@
         }
         # If it's a test version, then tag == 0.date
-        if (defined $testver->{$ENV{'PBPROJ'}}) {
+        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
             $pbtag = "0.".strftime("%Y%m%d%H%M%S", @date);
             $ENV{'PBPROJTAG'} = $pbtag;
@@ -1729 +1729 @@
 
             my ($verpmtype) = pb_conf_get("verpmtype");
-            if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} eq "true") || ($pbforce == 1)) {
+            if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i) || ($pbforce == 1)) {
                 # We have to rebuild the chroot
                 if ($dtype eq "rpm") {
@@ -2027 +2027 @@
         s/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/projver $ENV{'PBPROJ'} = $newver/;
         pb_log(0,"Changing projver from $oldver to $newver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/);
+        pb_log(0,"Commenting testver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
         s/^testver/#testver/;
-        pb_log(0,"Commenting testver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
         print OUT $_;
     }