diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-03-03 10:35:52 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-03-03 15:31:49 +0000 |
commit | e8a67a7d12d2defbf975d707e7513837403d93a2 (patch) | |
tree | 376919bf85989db6a44d3377582d6419e889a864 /morphlib/plugins/system_manifests_plugin.py | |
parent | bb139ecf1b9de3b221ff1d93c26190a8623d5d33 (diff) | |
download | morph-e8a67a7d12d2defbf975d707e7513837403d93a2.tar.gz |
Hide get_repo() and cache_repo() functions, always use get_updated_repo()
This allows us to simplify a couple of places.
I cannot think of a single situation where'd you want to get the cached
copy of a repo, but not update it. Think about it -- the repo might be
*years* behind the upstream remote.
Change-Id: I60340c7fb33e7bfe871ad30c0a9322a7202548e2
Diffstat (limited to 'morphlib/plugins/system_manifests_plugin.py')
-rw-r--r-- | morphlib/plugins/system_manifests_plugin.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/morphlib/plugins/system_manifests_plugin.py b/morphlib/plugins/system_manifests_plugin.py index 8e14d2eb..4444ecb3 100644 --- a/morphlib/plugins/system_manifests_plugin.py +++ b/morphlib/plugins/system_manifests_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 Codethink Limited +# Copyright (C) 2015-2016 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -150,11 +150,7 @@ class SystemManifestsPlugin(cliapp.Plugin): name = source.morphology['name'] ref = source.original_ref - # Ensure we have a cache of the repo - if not self.lrc.has_repo(source.repo_name): - self.lrc.cache_repo(source.repo_name) - - cached = self.lrc.get_repo(source.repo_name) + cached = self.lrc.get_updated_repo(source.repo_name, ref) new_prefix = '[%d/%d][%s] ' % (i, len(sources), name) self.app.status_prefix = old_prefix + new_prefix @@ -174,9 +170,7 @@ def run_licensecheck(filename): return output[len(filename) + 2:].strip() def checkout_repo(lrc, repo, dest, ref='master'): - if not lrc.has_repo(repo): - lrc.cache_repo(repo) - cached = lrc.get_repo(repo) + cached = lrc.get_updated_repo(repo, ref) if not os.path.exists(dest): cached.checkout(ref, dest) |