mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
- 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.
Build-tools/Bootstrap:
- fixed a bug: 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.
This commit is contained in:
@@ -43,6 +43,7 @@ $opt_test= undef;
|
||||
$opt_skip_check= undef;
|
||||
$opt_skip_manual= undef;
|
||||
$version= "unknown";
|
||||
$major=$minor=$release=0;
|
||||
|
||||
GetOptions(
|
||||
"build-command|b=s",
|
||||
@@ -149,6 +150,7 @@ if (!$opt_dry_run)
|
||||
{
|
||||
m/^AM_INIT_AUTOMAKE\(mysql, ([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\)/;
|
||||
$version= $1;
|
||||
($major, $minor, $release) = split(/\./,$version);
|
||||
}
|
||||
&logger("Found version string: $version");
|
||||
|
||||
@@ -218,7 +220,7 @@ if (defined $opt_changelog)
|
||||
{
|
||||
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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user