Changeset 585 in ProjectBuilder
- Timestamp:
- Oct 13, 2008, 1:23:02 PM (16 years ago)
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r572 r585 2029 2029 2030 2030 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"); 2032 2043 close(OUT); 2033 2044 push(@files,"$ENV{'PBTMP'}/$pbpkg.ann"); -
devel/pb/lib/ProjectBuilder/Changelog.pm
r544 r585 68 68 my $pbver = $pb->{'ver'}; 69 69 my $pbtag = $pb->{'tag'}; 70 my $dsuf = $pb->{'suf'}; 71 my $path = shift; 70 my $pbsuf = $pb->{'suf'}; 72 71 my $OUTPUT = shift; 73 72 my $doit = shift; … … 83 82 (not (defined $pbver)) || ($pbver eq "") || 84 83 (not (defined $pbtag)) || ($pbtag eq "") || 85 (not (defined $dsuf)) || ($dsuf eq "") || 86 (not (defined $path)) || ($path eq "") || 84 (not (defined $pbsuf)) || ($pbsuf eq "") || 87 85 (not (defined $OUTPUT)) || ($OUTPUT eq "") || 88 86 (not (defined $doit)) || ($doit eq "")) { … … 115 113 $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z"); 116 114 if (($dtype eq "rpm") || ($dtype eq "fc")) { 117 $ver2 = "$pbver-$pbtag$ dsuf";115 $ver2 = "$pbver-$pbtag$pbsuf"; 118 116 print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n"; 119 117 print $OUTPUT "- Updated to $pbver\n"; … … 164 162 if ($ver !~ /-/) { 165 163 if ($first eq 1) { 166 $ver2 = "$ver-$pbtag$ dsuf";164 $ver2 = "$ver-$pbtag$pbsuf"; 167 165 $first=0; 168 166 } else { 169 $ver2 = "$ver-1$ dsuf";167 $ver2 = "$ver-1$pbsuf"; 170 168 } 171 169 } else { 172 $ver2 = "$ver$ dsuf";170 $ver2 = "$ver$pbsuf"; 173 171 } 174 172 print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n"; -
devel/pb/lib/ProjectBuilder/Filter.pm
r543 r585 160 160 } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) { 161 161 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); 165 163 $tmp = ""; 166 164 } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
Note:
See TracChangeset
for help on using the changeset viewer.