Changeset 2109 in ProjectBuilder

Timestamp:

Jul 21, 2016, 4:19:43 AM (9 years ago)

Author:

Bruno Cornec

Message:

Fix changelog generation with new test names

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• lib/ProjectBuilder/Changelog.pm (modified) (3 diffs)

devel/pb/bin/pb

@@ -2195 +2195 @@
         $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        my $debarch = "";
-
         if (($pbos->{'type'} eq "rpm") || ($pbos->{'type'} eq "pkg") || ($pbos->{'type'} eq "hpux") || ($pbos->{'type'} eq "tgz")) {
             # put packages under an arch subdir

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -67 +67 @@
 my $pbver = $pb->{'ver'};
 my $pbtag = $pb->{'tag'};
-my $pbextdir = $pb->{'extdir'};
 my $pbsuf = $pb->{'pbos'}->{'suffix'};
 my $OUTPUT = shift;
@@ -111 +110 @@
     $ndate = &UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
-    # useful mostly for test versions
-    $pbver .= $pbextdir;
     if ($dtype eq "rpm") {
         $ver2 = "$pbver-$pbtag";
@@ -167 +164 @@
     if ($ver !~ /-/) {
         if ($first eq 1) {
-            $ver2 = "$ver$pbextdir-$pbtag";
+            $ver2 = "$ver-$pbtag";
             $first = 0;
         } else {