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:14:11 UTC

lucene-solr:master: try to fix back compat version check again

Repository: lucene-solr
Updated Branches:
  refs/heads/master f8536ce72 -> d19ecc0e6


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/d19ecc0e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d19ecc0e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d19ecc0e

Branch: refs/heads/master
Commit: d19ecc0e65ec024dfe8f9a5671e92af4347c5644
Parents: f8536ce
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:14:01 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/d19ecc0e/dev-tools/scripts/addVersion.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 262e099..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 current_version.is_back_compat_with(c.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 current_version.is_back_compat_with(c.version):
+  elif is_back_compat:
     print('\nTesting changes')
     check_lucene_version_tests()
     check_solr_version_tests()