Changeset 774 in MondoRescue for branches/stable

Timestamp:

Aug 9, 2006, 1:02:02 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix bug #41 (changelogs broken)

Location:

branches/stable/tools

Files:

• mkchangelog.pl (modified) (4 diffs)
• mknewtag (modified) (1 diff)

branches/stable/tools/mkchangelog.pl

@@ -23 +23 @@
 my $tmp = "";
 my $ver = "";
+my $ver2 = "";
 my $date = "";
 
@@ -61 +62 @@
 open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
 open(OUTPUT,"> $outfile") || die "Unable to open $outfile (write)";
+open(TAG, "$ENV{TOPDIR}/LAST") || die "Unable to open $ENV{TOPDIR}/LAST";
+
+$tmp = <TAG>;
+chomp($tmp);
+my ($tmp2, $tag) = split(/-/, $tmp);
 # Skip first 4 lines
 $tmp = <INPUT>;
@@ -76 +82 @@
 while (<INPUT>) {
     ($ver, $date) = split(/ /);
+    $ver =~ s/^v//;
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
@@ -83 +90 @@
     #print "**$ndate**\n";
     if ($dtype eq "rpm") {
-        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
+        if ($ver !~ /-/) {
+            $ver2 = "$ver-$tag";
+        } else {
+            $ver2 = $ver;
+        }
+        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
         print OUTPUT "- Updated to $ver\n";
         }

branches/stable/tools/mknewtag

@@ -35 +35 @@
 if [ $nb -gt 0 ]; then
     echo "You'll have to check in before updating the TAG"
-    echo "$TAG" > $TOOLHOME/TAG
+    exit -1
 else
     for p in mindi mondo; do
         v=`cat $TOOLHOME/../$p/VERSION`
-        grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
+        grep -q "${v}" $TOOLHOME/../$p/ChangeLog
         if [ $? -ne 0 ]; then
-            echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
+            echo "You'll have to document in ${p}'s ChangeLog for ${v} related modifications"
             exit -1
         fi