Changeset 585


Ignore:
Timestamp:
Oct 13, 2008, 1:23:02 PM (11 years ago)
Author:
bruno
Message:
  • Change pb_announce interface
  • Fix announce bug where changes were not displayed
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r572 r585  
    20292029
    20302030        open(OUT,"> $ENV{'PBTMP'}/$pbpkg.ann") || die "Unable to create $ENV{'PBTMP'}/$pbpkg.ann: $!";
    2031         pb_changelog("announce",$pbpkg,$pbver,"N/A","N/A","N/A",\*OUT,"yes",$chglog);
     2031        my %pb;
     2032        $pb{'dtype'} = "announce";
     2033        $pb{'realpkg'} = $pbpkg;
     2034        $pb{'ver'} = $pbver;
     2035        $pb{'tag'} = $pbtag;
     2036        $pb{'suf'} = "N/A";     # Should not be empty even if unused
     2037        $pb{'date'} = $pbdate;
     2038        $pb{'chglog'} = $chglog;
     2039        $pb{'packager'} = $pbpackager;
     2040        $pb{'proj'} = $ENV{'PBPROJ'};
     2041        $pb{'repo'} = $pbrepo;
     2042        pb_changelog(\%pb,\*OUT,"yes");
    20322043        close(OUT);
    20332044        push(@files,"$ENV{'PBTMP'}/$pbpkg.ann");
  • devel/pb/lib/ProjectBuilder/Changelog.pm

    r544 r585  
    6868my $pbver = $pb->{'ver'};
    6969my $pbtag = $pb->{'tag'};
    70 my $dsuf = $pb->{'suf'};
    71 my $path = shift;
     70my $pbsuf = $pb->{'suf'};
    7271my $OUTPUT = shift;
    7372my $doit = shift;
     
    8382        (not (defined $pbver)) || ($pbver eq "") ||
    8483        (not (defined $pbtag)) || ($pbtag eq "") ||
    85         (not (defined $dsuf)) || ($dsuf eq "") ||
    86         (not (defined $path)) || ($path eq "") ||
     84        (not (defined $pbsuf)) || ($pbsuf eq "") ||
    8785        (not (defined $OUTPUT)) || ($OUTPUT eq "") ||
    8886        (not (defined $doit)) || ($doit eq "")) {
     
    115113    $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
    116114    if (($dtype eq "rpm") || ($dtype eq "fc")) {
    117         $ver2 = "$pbver-$pbtag$dsuf";
     115        $ver2 = "$pbver-$pbtag$pbsuf";
    118116        print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
    119117        print $OUTPUT "- Updated to $pbver\n";
     
    164162        if ($ver !~ /-/) {
    165163            if ($first eq 1) {
    166                 $ver2 = "$ver-$pbtag$dsuf";
     164                $ver2 = "$ver-$pbtag$pbsuf";
    167165                $first=0;
    168166            } else {
    169                 $ver2 = "$ver-1$dsuf";
     167                $ver2 = "$ver-1$pbsuf";
    170168            }
    171169        } else {
    172             $ver2 = "$ver$dsuf";
     170            $ver2 = "$ver$pbsuf";
    173171        }
    174172        print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
  • devel/pb/lib/ProjectBuilder/Filter.pm

    r543 r585  
    160160        } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
    161161            pb_log(3,"DEBUG filtering PBLOG\n");
    162             my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}};
    163             $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p);
    164             pb_changelog($pb, $p, \*DEST, $tmp);
     162            pb_changelog($pb, \*DEST, $tmp);
    165163            $tmp = "";
    166164        } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
Note: See TracChangeset for help on using the changeset viewer.