summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2011-11-02 14:48:33 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2011-11-02 14:48:33 +0000
commited33c0b35d5959bcd0b4d9f75bc6fba1f9df0b76 (patch)
tree73880f88703992159951de134a82b8641d5a8291
parent1a19ec8659ccdb0c2c75e433a359c36645a74e92 (diff)
downloadmorph-ed33c0b35d5959bcd0b4d9f75bc6fba1f9df0b76.tar.gz
Resolve morph repos relative to --git-base-url and add progress info
-rw-r--r--morphlib/builder.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py
index 9e771995..69204253 100644
--- a/morphlib/builder.py
+++ b/morphlib/builder.py
@@ -115,6 +115,7 @@ class Chunk(BinaryBlob):
self.prepare_binary_metadata()
+ self.msg('Creating binary for %s' % self.morph.name)
morphlib.bins.create_chunk(self.destdir, self.filename)
@@ -150,6 +151,7 @@ class Stratum(BinaryBlob):
self.msg('Unpacking chunk %s' % chunk_name)
morphlib.bins.unpack_chunk(filename, self.destdir)
self.prepare_binary_metadata()
+ self.msg('Creating binary for %s' % self.morph.name)
morphlib.bins.create_stratum(self.destdir, self.filename)
@@ -267,6 +269,7 @@ class Builder(object):
def build(self, repo, ref, filename):
'''Build a binary based on a morphology.'''
+ repo = urlparse.urljoin(self.settings['git-base-url'], repo)
morph = self.get_morph_from_git(repo, ref, filename)
if morph.kind == 'chunk':