Changeset 897 for devel/pb/bin/pb


Ignore:
Timestamp:
Nov 10, 2009, 1:23:15 AM (10 years ago)
Author:
bruno
Message:
  • Improve some testver usages and fix #51. Now passing false to testver works
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r892 r897  
    545545        }
    546546        # If it's a test version, then tag == 0.date
    547         if (defined $testver->{$ENV{'PBPROJ'}}) {
     547        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
    548548            $pbtag = "0.".strftime("%Y%m%d%H%M%S", @date);
    549549            $ENV{'PBPROJTAG'} = $pbtag;
     
    17291729
    17301730            my ($verpmtype) = pb_conf_get("verpmtype");
    1731             if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} eq "true") || ($pbforce == 1)) {
     1731            if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i) || ($pbforce == 1)) {
    17321732                # We have to rebuild the chroot
    17331733                if ($dtype eq "rpm") {
     
    20272027        s/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/projver $ENV{'PBPROJ'} = $newver/;
    20282028        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/);
     2029        pb_log(0,"Commenting testver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
    20292030        s/^testver/#testver/;
    2030         pb_log(0,"Commenting testver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
    20312031        print OUT $_;
    20322032    }
Note: See TracChangeset for help on using the changeset viewer.