Changeset 774 for branches/stable


Ignore:
Timestamp:
Aug 9, 2006, 1:02:02 AM (13 years ago)
Author:
bruno
Message:

Fix bug #41 (changelogs broken)

Location:
branches/stable/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/tools/mkchangelog.pl

    r710 r774  
    2323my $tmp = "";
    2424my $ver = "";
     25my $ver2 = "";
    2526my $date = "";
    2627
     
    6162open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
    6263open(OUTPUT,"> $outfile") || die "Unable to open $outfile (write)";
     64open(TAG, "$ENV{TOPDIR}/LAST") || die "Unable to open $ENV{TOPDIR}/LAST";
     65
     66$tmp = <TAG>;
     67chomp($tmp);
     68my ($tmp2, $tag) = split(/-/, $tmp);
    6369# Skip first 4 lines
    6470$tmp = <INPUT>;
     
    7682while (<INPUT>) {
    7783    ($ver, $date) = split(/ /);
     84    $ver =~ s/^v//;
    7885    chomp($date);
    7986    $date =~ s/\(([0-9-]+)\)/$1/;
     
    8390    #print "**$ndate**\n";
    8491    if ($dtype eq "rpm") {
    85         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
     92        if ($ver !~ /-/) {
     93            $ver2 = "$ver-$tag";
     94        } else {
     95            $ver2 = $ver;
     96        }
     97        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
    8698        print OUTPUT "- Updated to $ver\n";
    8799        }
  • branches/stable/tools/mknewtag

    r651 r774  
    3535if [ $nb -gt 0 ]; then
    3636    echo "You'll have to check in before updating the TAG"
    37     echo "$TAG" > $TOOLHOME/TAG
     37    exit -1
    3838else
    3939    for p in mindi mondo; do
    4040        v=`cat $TOOLHOME/../$p/VERSION`
    41         grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
     41        grep -q "${v}" $TOOLHOME/../$p/ChangeLog
    4242        if [ $? -ne 0 ]; then
    43             echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
     43            echo "You'll have to document in ${p}'s ChangeLog for ${v} related modifications"
    4444            exit -1
    4545        fi
Note: See TracChangeset for help on using the changeset viewer.