summaryrefslogtreecommitdiff
path: root/morphlib/builder2.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-17 18:57:28 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-18 18:29:25 +0100
commit097dd0c085a0aa13af929db04b7ef10e7564698f (patch)
tree1668e49df47af19e2933d1217583e0cc8405b8b9 /morphlib/builder2.py
parenta04f2f05b6aaa0d99420ad45c35a56be93445566 (diff)
downloadmorph-097dd0c085a0aa13af929db04b7ef10e7564698f.tar.gz
Fix minor problems
Diffstat (limited to 'morphlib/builder2.py')
-rw-r--r--morphlib/builder2.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 394805c6..5b428232 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -42,12 +42,14 @@ class BuilderBase(object):
'''
+ assert isinstance(self.artifact.source.repo,
+ morphlib.cachedrepo.CachedRepo)
meta = {
'artifact-name': artifact_name,
'source-name': self.artifact.source.morphology['name'],
'kind': self.artifact.source.morphology['kind'],
'description': self.artifact.source.morphology['description'],
- 'repo': self.artifact.source.repo,
+ 'repo': self.artifact.source.repo.url,
'original_ref': self.artifact.source.original_ref,
'sha1': self.artifact.source.sha1,
'morphology': self.artifact.source.filename,
@@ -222,7 +224,7 @@ class StratumBuilder(BuilderBase):
self.write_metadata(destdir, artifact_name)
artifact = self.new_artifact(artifact_name)
with self.artifact_cache.put(artifact) as f:
- morphlib.bins.create_stratum(destdir, f, ex)
+ morphlib.bins.create_stratum(destdir, f, None)
class SystemBuilder(BuilderBase): # pragma: no cover