Changeset 1703 in ProjectBuilder

Timestamp:

Mar 1, 2013, 4:47:51 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #119 by improving correct deb and ebuild detection. Will also work for announces

File:

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

devel/pb/bin/pb

@@ -3672 +3672 @@
             $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz ";
         } else {
+            # "Announce" and "Check"
             my @date=pb_get_date();
             # the matching is only done on packages made the same day for test version. Hopefully this is enough
-            my $nver = $pbver;
-            if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i) && ($antype eq "Check")) {
+            my $nver;
+            if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
                 $pbtag = "0";
                 my $ntag .= strftime("%Y%m%d*", @date);
                 $nver = $pbver."_p$ntag";
                 $pbver .= $ntag;
-            }
-            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver\.deb\' -o -name \'$pbrealpkg-$nver\.ebuild\' -o -name \'$pbrealpkg-$pbver\.pkg\' -o -name \'$pbrealpkg-$pbver\.sd\' ";
+            } else { 
+                $nver = $pbver."-r$pbtag";
+            }
+            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkg-$nver\.ebuild\' -o -name \'$pbrealpkg-$pbver\.pkg\' -o -name \'$pbrealpkg-$pbver\.sd\' ";
         }
 
@@ -3792 +3795 @@
         }
     } else {
-        # In Check mode we need to compare the 2 lists (real and theoritical)
+        # In "Check" mode we need to compare the 2 lists (real and theoritical)
         while (<LOG>) {
             # Get package name and remove what is in extra for the theoritical list (arch at the end)
@@ -3800 +3803 @@
             my $p = $_;
             $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
-            $p =~ s/_(i[3456]86|amd64|all).deb$//;
+            $p =~ s/_(i[3456]86|amd64|all)\.deb$//;
             $p =~ s/(-0\.[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
             $p =~ s/(-r|_p[0-9]+)\.ebuild/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));