Changeset 585 in ProjectBuilder

Timestamp:

Oct 13, 2008, 1:23:02 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Change pb_announce interface
• Fix announce bug where changes were not displayed

Files:

• devel/pb/bin/pb (modified) (1 diff)
• devel/pb/lib/ProjectBuilder/Changelog.pm (modified) (4 diffs)
• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)
• projects/mondorescue/pbconf/announces3.sql (modified) ( previous)

devel/pb/bin/pb

@@ -2029 +2029 @@
 
         open(OUT,"> $ENV{'PBTMP'}/$pbpkg.ann") || die "Unable to create $ENV{'PBTMP'}/$pbpkg.ann: $!";
-        pb_changelog("announce",$pbpkg,$pbver,"N/A","N/A","N/A",\*OUT,"yes",$chglog);
+        my %pb;
+        $pb{'dtype'} = "announce";
+        $pb{'realpkg'} = $pbpkg;
+        $pb{'ver'} = $pbver;
+        $pb{'tag'} = $pbtag;
+        $pb{'suf'} = "N/A";     # Should not be empty even if unused
+        $pb{'date'} = $pbdate;
+        $pb{'chglog'} = $chglog;
+        $pb{'packager'} = $pbpackager;
+        $pb{'proj'} = $ENV{'PBPROJ'};
+        $pb{'repo'} = $pbrepo;
+        pb_changelog(\%pb,\*OUT,"yes");
         close(OUT);
         push(@files,"$ENV{'PBTMP'}/$pbpkg.ann");

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -68 +68 @@
 my $pbver = $pb->{'ver'};
 my $pbtag = $pb->{'tag'};
-my $dsuf = $pb->{'suf'};
-my $path = shift;
+my $pbsuf = $pb->{'suf'};
 my $OUTPUT = shift;
 my $doit = shift;
@@ -83 +82 @@
         (not (defined $pbver)) || ($pbver eq "") || 
         (not (defined $pbtag)) || ($pbtag eq "") || 
-        (not (defined $dsuf)) || ($dsuf eq "") || 
-        (not (defined $path)) || ($path eq "") || 
+        (not (defined $pbsuf)) || ($pbsuf eq "") || 
         (not (defined $OUTPUT)) || ($OUTPUT eq "") ||
         (not (defined $doit)) || ($doit eq "")) {
@@ -115 +113 @@
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
-        $ver2 = "$pbver-$pbtag$dsuf";
+        $ver2 = "$pbver-$pbtag$pbsuf";
         print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $pbver\n";
@@ -164 +162 @@
         if ($ver !~ /-/) {
             if ($first eq 1) {
-                $ver2 = "$ver-$pbtag$dsuf";
+                $ver2 = "$ver-$pbtag$pbsuf";
                 $first=0;
             } else {
-                $ver2 = "$ver-1$dsuf";
+                $ver2 = "$ver-1$pbsuf";
             }
         } else {
-            $ver2 = "$ver$dsuf";
+            $ver2 = "$ver$pbsuf";
         }
         print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -160 +160 @@
         } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
             pb_log(3,"DEBUG filtering PBLOG\n");
-            my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}};
-            $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p);
-            pb_changelog($pb, $p, \*DEST, $tmp);
+            pb_changelog($pb, \*DEST, $tmp);
             $tmp = "";
         } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {