diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-01 16:20:10 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-13 15:20:02 +0000 |
| commit | 6a61dd9cc1fe8a3ccd2128fb628ed929fd496ad0 (patch) | |
| tree | e73e977eabdc5dc60dfc89152e116f40b3456a94 /morphlib/buildcommand.py | |
| parent | b7f69986034afef8a792839fac601caa0f20d55a (diff) | |
| download | morph-6a61dd9cc1fe8a3ccd2128fb628ed929fd496ad0.tar.gz | |
Remove support for bootstrap mode in staging area
This involved having a staging area with split personalities
and was generally a bit ugly.
Diffstat (limited to 'morphlib/buildcommand.py')
| -rw-r--r-- | morphlib/buildcommand.py | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 4200dc0e..c7c650d3 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -224,8 +224,7 @@ class BuildCommand(object): self.install_chunk_artifacts(staging_area, deps, artifact) morphlib.builder2.ldconfig(self.app.runcmd, - staging_area.tempdir) - + staging_area.dirname) self.build_and_cache(staging_area, artifact) self.remove_staging_area(staging_area) self.app.status(msg='%(kind)s %(name)s is cached at %(cachepath)s', @@ -315,32 +314,19 @@ class BuildCommand(object): def create_staging_area(self, artifact): '''Create the staging area for building a single artifact.''' - staging_root = tempfile.mkdtemp(dir=self.app.settings['tempdir']) - staging_temp = staging_root - self.app.status(msg='Creating staging area') - staging_area = morphlib.stagingarea.StagingArea(self.app, - staging_root, - staging_temp) + staging_dir = tempfile.mkdtemp(dir=self.app.settings['tempdir']) + staging_area = morphlib.stagingarea.StagingArea(self.app, staging_dir) return staging_area def remove_staging_area(self, staging_area): '''Remove the staging area.''' - if staging_area.dirname != '/': - self.app.status(msg='Removing staging area') - staging_area.remove() - temp_path = staging_area.tempdir - if temp_path != '/' and os.path.exists(temp_path): - self.app.status(msg='Removing temporary staging directory') - shutil.rmtree(temp_path) + self.app.status(msg='Removing staging area') + staging_area.remove() def install_fillers(self, staging_area): - '''Install staging fillers into the staging area. - - This must not be called in bootstrap mode. - - ''' + '''Install staging fillers into the staging area.''' logging.debug('Pre-populating staging area %s' % staging_area.dirname) logging.debug('Fillers: %s' % |