diff options
| -rw-r--r-- | baserockimport/mainloop.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py index 8a7ae26..2ffbd82 100644 --- a/baserockimport/mainloop.py +++ b/baserockimport/mainloop.py @@ -207,6 +207,10 @@ class ImportLoop(object): checked_out_version, ref = self._checkout_source_version_for_package( source_repo, package) + + logging.debug('Checked out version: %s\tRef: %s', + checked_out_version, ref) + package.set_version_in_use(checked_out_version) repo_path = os.path.relpath(source_repo.dirname) @@ -402,11 +406,10 @@ class ImportLoop(object): name = package.name version = package.version - possible_names = [ - version, - 'v%s' % version, - '%s-%s' % (name, version) - ] + possible_names = [] + + for v in [version, version.rstrip('.0'), '%s.0' % version]: + possible_names += [v, 'v%s' % v, '%s-%s' % (name, v)] for tag_name in possible_names: if source_repo.ref_exists(tag_name): |