From 097dd0c085a0aa13af929db04b7ef10e7564698f Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Tue, 17 Apr 2012 18:57:28 +0100 Subject: Fix minor problems --- morphlib/builder2.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'morphlib/builder2.py') 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 -- cgit v1.2.1