Mercurial > hg > truffle
changeset 12520:8ee3a8dd762e
mxtool sclone: check import version when imported suite already exists
author | Mick Jordan <mick.jordan@oracle.com> |
---|---|
date | Mon, 21 Oct 2013 20:36:08 -0700 |
parents | 5cde653f58f9 |
children | ef0de9485627 |
files | mxtool/mx.py |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Mon Oct 21 15:14:43 2013 -0700 +++ b/mxtool/mx.py Mon Oct 21 20:36:08 2013 -0700 @@ -4021,7 +4021,10 @@ importee_source = _src_suitemodel._importee_dir(source, suite_import.name) importee_dest = _dst_suitemodel._importee_dir(s.dir, suite_import.name) if exists(importee_dest): + # already exists in the suite model, but may be wrong version importee_suite = _scloneimports_suitehelper(importee_dest) + if suite_import.version is not None and importee_suite.version != suite_import.version: + abort("import version of " + suite_import.name + " in " + s.name + " does not match the version in already existing suite: " + importee_suite.dir) importee_suite._visit_imports(_scloneimports_visitor, source=importee_source) else: _sclone(importee_source, importee_dest, suite_import.version, False)