summaryrefslogtreecommitdiff
path: root/morphlib/plugins/artifact_inspection_plugin.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2016-03-03 10:35:52 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2016-03-03 15:31:49 +0000
commite8a67a7d12d2defbf975d707e7513837403d93a2 (patch)
tree376919bf85989db6a44d3377582d6419e889a864 /morphlib/plugins/artifact_inspection_plugin.py
parentbb139ecf1b9de3b221ff1d93c26190a8623d5d33 (diff)
downloadmorph-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/artifact_inspection_plugin.py')
-rw-r--r--morphlib/plugins/artifact_inspection_plugin.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/morphlib/plugins/artifact_inspection_plugin.py b/morphlib/plugins/artifact_inspection_plugin.py
index fc433a01..413a0072 100644
--- a/morphlib/plugins/artifact_inspection_plugin.py
+++ b/morphlib/plugins/artifact_inspection_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015 Codethink Limited
+# Copyright (C) 2012-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
@@ -46,7 +46,7 @@ class ProjectVersionGuesser(object):
filenames = [x for x in self.interesting_files if x in tree]
if filenames:
if self.lrc.has_repo(repo):
- repository = self.lrc.get_repo(repo)
+ repository = self.lrc.get_updated_repo(repo, ref)
for filename in filenames:
yield filename, repository.read_file(filename, ref)
elif self.rrc:
@@ -147,9 +147,7 @@ class VersionGuesser(object):
version = None
try:
if self.lrc.has_repo(repo):
- repository = self.lrc.get_repo(repo)
- if not self.app.settings['no-git-update']:
- repository.update()
+ repository = self.lrc.get_updated_repo(repo, ref)
tree = repository.list_files(ref=ref, recurse=False)
elif self.rrc:
repository = None