Changeset 1420 in ProjectBuilder

Timestamp:

Feb 24, 2012, 2:47:40 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix 2 bugs in newver with automatic change of version and delivery check to be done.

File:

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

devel/pb/bin/pb

@@ -2621 +2621 @@
     open(OUT,"> $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb.new";
     while(<FILE>) {
-        if (/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldvertxt/) {
-            s/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldvertxt/projver $ENV{'PBPROJ'} = $newvertxt/;
+        if (/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldvertxt$/) {
+            s/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldvertxt$/projver $ENV{'PBPROJ'} = $newvertxt/;
             pb_log(0,"Changing projver from $oldvertxt to $newvertxt in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb\n");
         }
@@ -2630 +2630 @@
         }
         if (/^delivery/) {
-            pb_log(0,"Please check delivery (".chomp($_).") in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb\n");
+            my $txt = $_;
+            chomp($txt);
+            pb_log(0,"Please check delivery ($txt) in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb\n");
         }
         print OUT $_;
@@ -3290 +3292 @@
             $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz ";
         } else {
+            my @date=pb_get_date();
+            # the matching is only done on packages made the same day for test version. Hopefully this is enough
+            $pbtag = "0.".strftime("%Y%m%d*", @date) if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i) && ($antype eq "Check"));
             $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver*\.deb\' -o -name \'$pbrealpkg-$pbver*\.ebuild\' -o -name \'$pbrealpkg-$pbver*\.pkg\' -o -name \'$pbrealpkg-$pbver*\.sd\' ";
         }
@@ -3325 +3330 @@
                 } elsif ($pbos->{'type'} eq "deb") {
                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = 0;
+                    # TODO are we always using the last arch ?
                     $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$pbos->{'arch'}";
                 } elsif ($pbos->{'type'} eq "ebuild") {
-                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver-r$pbtag.ebuild"} = 0;
-                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver-r$pbtag.ebuild"} = "$pbos->{'arch'}";
+                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver"."_p$pbtag.ebuild"} = 0;
+                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver"."_p$pbtag.ebuild"} = "$pbos->{'arch'}";
                 } elsif ($pbos->{'type'} eq "pkg") {
                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkg-$pbver-$pbtag.pkg"} = 0;
@@ -3406 +3412 @@
             $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
             $p =~ s/_(i[3456]86|amd64|all).deb$//;
+            $p =~ s/(-0\.|_p[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
             $theorlist{$p} = -2 if (not defined $theorlist{$p});
             $theorlist{$p} = $theorlist{$p} + 1;
@@ -3428 +3435 @@
                 pb_log(0,"Extra Package found for $t\n");
             } else {
+                pb_log(2,"Analyzing $t\n");
                 my ($os,$ver,$arch,$package) = split(/\//,$t);
                 # Some distro have no arch subdir