diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-13 15:18:24 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-14 17:03:34 +0000 |
commit | 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7 (patch) | |
tree | e2e9eff2985df2ff5eabd3c0700756ea755861d4 /baserockimport/mainloop.py | |
parent | 8f32749511f4cab0ac1c6d74025fc1b21578996c (diff) | |
download | import-461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7.tar.gz |
Add more possible namesbaserock/richardipsum/add-more-possible-names
This fixes the tool so that it can find refs such as foobar-1.4.0 when
the version has been passed as 1.4 and refs such as foobar-1.4 when the version
has been passed 1.4.0
Diffstat (limited to 'baserockimport/mainloop.py')
-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): |