diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-05 09:56:03 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-05 09:57:44 +0000 |
commit | f3197d814a5e883f47631a4f0acfa51bd1285daf (patch) | |
tree | b1353461cfa944c62a7bfbbc8fb51664581bfe27 /morphlib/buildcommand.py | |
parent | a4f5d580dfe9b1715e24dd1b49dde4f1d240b880 (diff) | |
parent | fb7eb661b2b02bf049d24fa4a232f303b5058b1b (diff) | |
download | morph-f3197d814a5e883f47631a4f0acfa51bd1285daf.tar.gz |
Merge remote-tracking branch 'origin/sam/rename-builder2'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Diffstat (limited to 'morphlib/buildcommand.py')
-rw-r--r-- | morphlib/buildcommand.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 527163f6..5c7d5c5e 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2014 Codethink Limited +# Copyright (C) 2011-2015 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 @@ -528,7 +528,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.''' @@ -536,7 +536,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) |