summaryrefslogtreecommitdiff
path: root/morphlib/buildcommand.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-19 11:08:23 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-19 11:08:23 +0000
commitfb7eb661b2b02bf049d24fa4a232f303b5058b1b (patch)
tree10192377f6ad8721f47e071b1c52d6151021e00c /morphlib/buildcommand.py
parent8e319db777ccb11ae565293e5c86919192fb459b (diff)
downloadmorph-fb7eb661b2b02bf049d24fa4a232f303b5058b1b.tar.gz
Rename builder2 module to builder
Diffstat (limited to 'morphlib/buildcommand.py')
-rw-r--r--morphlib/buildcommand.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index a658fc55..68fce693 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -518,7 +518,7 @@ class BuildCommand(object):
staging_area.install_artifact(handle)
if target_source.build_mode == 'staging':
- morphlib.builder2.ldconfig(self.app.runcmd, staging_area.dirname)
+ morphlib.builder.ldconfig(self.app.runcmd, staging_area.dirname)
def build_and_cache(self, staging_area, source, setup_mounts):
'''Build a source and put its artifacts into the local cache.'''
@@ -526,7 +526,7 @@ class BuildCommand(object):
self.app.status(msg='Starting actual build: %(name)s '
'%(sha1)s',
name=source.name, sha1=source.sha1[:7])
- builder = morphlib.builder2.Builder(
+ builder = morphlib.builder.Builder(
self.app, staging_area, self.lac, self.rac, self.lrc,
self.app.settings['max-jobs'], setup_mounts)
return builder.build_and_cache(source)