diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-01 14:22:31 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-05 12:54:45 +0000 |
| commit | 810106852c4f100237aab3d02077048d302f5dd2 (patch) | |
| tree | ca5cca2985583a85414708720a4a7626b2b65ea8 | |
| parent | 4ed27e048453a018fbc17d53f56a36c121085cc3 (diff) | |
| download | morph-810106852c4f100237aab3d02077048d302f5dd2.tar.gz | |
sourceresolver: Remove cache_repo_locally
Change-Id: Ib8281c4030c42b61e298d6cc52f150a02384ed96
| -rw-r--r-- | morphlib/sourceresolver.py | 26 | ||||
| -rw-r--r-- | morphlib/sourceresolver_tests.py | 3 |
2 files changed, 9 insertions, 20 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index 36f8b752..d0164b3b 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -179,18 +179,6 @@ class SourceResolver(object): self._definitions_checkout_dir = None - def cache_repo_locally(self, reponame): - if self.update: - self.status(msg='Caching git repository %(reponame)s', - reponame=reponame) - repo = self.lrc.cache_repo(reponame) - else: # pragma: no cover - # This is likely to raise a morphlib.localrepocache.NotCached - # exception, because the caller should have checked if the - # localrepocache already had the repo. But we may as well try. - repo = self.lrc.get_repo(reponame) - return repo - def _resolve_ref(self, reponame, ref): # pragma: no cover '''Resolves commit and tree sha1s of the ref in a repo and returns it. @@ -235,7 +223,7 @@ class SourceResolver(object): logging.warning('Caught (and ignored) exception: %s' % str(e)) if absref is None: - repo = self.cache_repo_locally(reponame) + repo = self.lrc.get_updated_repo(reponame, ref) absref = repo.resolve_ref_to_commit(ref) tree = repo.resolve_ref_to_tree(absref) @@ -273,7 +261,7 @@ class SourceResolver(object): except morphlib.remoterepocache.CatFileError: text = None else: # pragma: no cover - repo = self.cache_repo_locally(reponame) + repo = self.lrc.get_updated_repo(reponame, sha1) text = repo.read_file(filename, sha1) return text @@ -346,7 +334,7 @@ class SourceResolver(object): pass if not file_list: - repo = self.cache_repo_locally(reponame) + repo = self.lrc.get_updated_repo(reponame, sha1) file_list = repo.list_files(ref=sha1, recurse=False) buildsystem = morphlib.buildsystem.detect_build_system(file_list) @@ -578,11 +566,9 @@ class SourceResolver(object): self._resolved_buildsystems = resolved_buildsystems self._definitions_repo = definitions_repo self._definitions_absref = definitions_absref - try: - definitions_cached_repo = self.lrc.get_repo(definitions_repo) - except morphlib.localrepocache.NotCached: - definitions_cached_repo = self.cache_repo_locally( - definitions_repo) + + definitions_cached_repo = self.lrc.get_updated_repo( + repo_name=definitions_repo, ref=definitions_absref) definitions_cached_repo.extract_commit( definitions_absref, self._definitions_checkout_dir) diff --git a/morphlib/sourceresolver_tests.py b/morphlib/sourceresolver_tests.py index 8af8d262..6cd4ddf7 100644 --- a/morphlib/sourceresolver_tests.py +++ b/morphlib/sourceresolver_tests.py @@ -142,6 +142,9 @@ class FakeLocalRepoCache(object): def cache_repo(self, reponame): return self.lr + def get_updated_repo(self, reponame, ref=None): + return self.lr + class SourceResolverTests(unittest.TestCase): |