diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-03-03 14:41:15 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-03-14 17:50:56 +0000 |
| commit | 23c021346571c24fa26eb348f573bab72fa257d9 (patch) | |
| tree | fbc21c1e9c1804a56758e218566fb9497d29fc26 /morphlib/plugins/system_manifests_plugin.py | |
| parent | 953a39140cf909f0130d76be587483b820dcd784 (diff) | |
| download | morph-23c021346571c24fa26eb348f573bab72fa257d9.tar.gz | |
Almost complete the unification
Change-Id: Ifc29f9cd22f2d8cc609ee178bb22a4580386431c
Diffstat (limited to 'morphlib/plugins/system_manifests_plugin.py')
| -rw-r--r-- | morphlib/plugins/system_manifests_plugin.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/plugins/system_manifests_plugin.py b/morphlib/plugins/system_manifests_plugin.py index b178e4b2..923a27b0 100644 --- a/morphlib/plugins/system_manifests_plugin.py +++ b/morphlib/plugins/system_manifests_plugin.py @@ -133,7 +133,8 @@ class SystemManifestsPlugin(cliapp.Plugin): except IndexError: trove_id = None with morphlib.util.temp_dir(dir=self.app.settings['tempdir']) as td: - lorries = get_lorry_repos(td, self.repo_cache, self.app.status, trove_id, + lorries = get_lorry_repos(td, self.repo_cache, self.app.status, + trove_id, self.app.settings['trove-host']) manifest = Manifest(system_artifact.name, td, self.app.status, self.repo_cache) @@ -242,7 +243,7 @@ def get_lorry_repos(tempdir, repo_cache, status, trove_id, trove_host): baserock_lorrydir = checkout_repo(repo_cache, baserock_lorry_repo, lorrydir) lorries.extend(load_lorries(lorrydir)) - except morphlib.localrepocache.NoRemote as e: + except morphlib.repocache.NoRemote as e: status(msg="WARNING: Could not find lorries from git.baserock.org, " "expected to find them on %(trove)s at %(reponame)s", trove=trove_host, reponame = e.reponame) |