Commit 9a9d7c6b authored by lenz@mysql.com's avatar lenz@mysql.com

- fixed a bug in Bootstrap script: simply searching for the last tagged

   ChangeSet was not sufficient to get the full ChangeLog between two
   released versions (when using "--changelog=last") as merging between 
   trees also merges the BK tags. Now we explicitely search for the last
   tagged ChangeSet that matches our major+minor version number, which 
   should match the last ChangeSet used for the previous release.
parent fbebac9a
...@@ -43,6 +43,7 @@ $opt_test= undef; ...@@ -43,6 +43,7 @@ $opt_test= undef;
$opt_skip_check= undef; $opt_skip_check= undef;
$opt_skip_manual= undef; $opt_skip_manual= undef;
$version= "unknown"; $version= "unknown";
$major=$minor=$release=0;
GetOptions( GetOptions(
"build-command|b=s", "build-command|b=s",
...@@ -149,6 +150,7 @@ if (!$opt_dry_run) ...@@ -149,6 +150,7 @@ if (!$opt_dry_run)
{ {
m/^AM_INIT_AUTOMAKE\(mysql, ([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\)/; m/^AM_INIT_AUTOMAKE\(mysql, ([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\)/;
$version= $1; $version= $1;
($major, $minor, $release) = split(/\./,$version);
} }
&logger("Found version string: $version"); &logger("Found version string: $version");
...@@ -218,7 +220,7 @@ if (defined $opt_changelog) ...@@ -218,7 +220,7 @@ if (defined $opt_changelog)
{ {
if (!$opt_revision) if (!$opt_revision)
{ {
$revision= `bk changes -t -d':REV:' -n $REPO | head -1`; $revision= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major-$minor | head -1 | cut -f1 -d ":"`;
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment