Mercurial > hg > truffle
comparison mxtool/mx.py @ 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 |
comparison
equal
deleted
inserted
replaced
| 12508:5cde653f58f9 | 12520:8ee3a8dd762e |
|---|---|
| 4019 def _scloneimports(s, suite_import, source): | 4019 def _scloneimports(s, suite_import, source): |
| 4020 # clone first, then visit imports once we can locate them | 4020 # clone first, then visit imports once we can locate them |
| 4021 importee_source = _src_suitemodel._importee_dir(source, suite_import.name) | 4021 importee_source = _src_suitemodel._importee_dir(source, suite_import.name) |
| 4022 importee_dest = _dst_suitemodel._importee_dir(s.dir, suite_import.name) | 4022 importee_dest = _dst_suitemodel._importee_dir(s.dir, suite_import.name) |
| 4023 if exists(importee_dest): | 4023 if exists(importee_dest): |
| 4024 # already exists in the suite model, but may be wrong version | |
| 4024 importee_suite = _scloneimports_suitehelper(importee_dest) | 4025 importee_suite = _scloneimports_suitehelper(importee_dest) |
| 4026 if suite_import.version is not None and importee_suite.version != suite_import.version: | |
| 4027 abort("import version of " + suite_import.name + " in " + s.name + " does not match the version in already existing suite: " + importee_suite.dir) | |
| 4025 importee_suite._visit_imports(_scloneimports_visitor, source=importee_source) | 4028 importee_suite._visit_imports(_scloneimports_visitor, source=importee_source) |
| 4026 else: | 4029 else: |
| 4027 _sclone(importee_source, importee_dest, suite_import.version, False) | 4030 _sclone(importee_source, importee_dest, suite_import.version, False) |
| 4028 # _clone handles the recursive visit of the new imports | 4031 # _clone handles the recursive visit of the new imports |
| 4029 | 4032 |