You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/08/20 08:12:02 UTC
lucene-solr:branch_6x: try to fix back compat version check again
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 213bc6589 -> 376495987
try to fix back compat version check again
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/37649598
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/37649598
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/37649598
Branch: refs/heads/branch_6x
Commit: 376495987955aa2e6dcee170f529176a86b5a1b8
Parents: 213bc65
Author: Mike McCandless <mi...@apache.org>
Authored: Sat Aug 20 04:11:49 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Sat Aug 20 04:11:49 2016 -0400
----------------------------------------------------------------------
dev-tools/scripts/addVersion.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/37649598/dev-tools/scripts/addVersion.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 75a22e0..e95a51f 100644
--- a/dev-tools/scripts/addVersion.py
+++ b/dev-tools/scripts/addVersion.py
@@ -217,7 +217,9 @@ def main():
update_changes('lucene/CHANGES.txt', c.version)
update_changes('solr/CHANGES.txt', c.version, get_solr_init_changes())
- if c.version.is_back_compat_with(current_version):
+ is_back_compat = current_version.major == c.version.major or current_version.is_back_compat_with(c.version)
+
+ if is_back_compat:
add_constant(c.version, not c.is_latest_version)
else:
print('\nNot adding constant for version %s because it is no longer supported' % c.version)
@@ -232,7 +234,7 @@ def main():
print('\nTODO: ')
print(' - Move backcompat oldIndexes to unsupportedIndexes in TestBackwardsCompatibility')
print(' - Update IndexFormatTooOldException throw cases')
- elif c.version.is_back_compat_with(current_version):
+ elif is_back_compat:
print('\nTesting changes')
check_lucene_version_tests()
check_solr_version_tests()