diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-14 16:04:22 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-14 16:04:22 +0000 |
| commit | d9c8acc730ecc7ea203fb0950a7f461f2822ef4f (patch) | |
| tree | 520deaa521f5d3ea71f591e273f4e27a802c7788 /morphlib/builder2.py | |
| parent | e5ce2f18d589b595682044589f4f5527e5b1bee6 (diff) | |
| download | morph-d9c8acc730ecc7ea203fb0950a7f461f2822ef4f.tar.gz | |
fix tabs and line widths so ./check passes
Diffstat (limited to 'morphlib/builder2.py')
| -rw-r--r-- | morphlib/builder2.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index e0e1ca57..4191c32a 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -76,8 +76,8 @@ def download_depends(constituents, lac, rac, metadatas=None): src = rac.get_artifact_metadata(constituent, metadata) dst = lac.put_artifact_metadata(constituent, metadata) shutil.copyfileobj(src, dst) - dst.close() - src.close() + dst.close() + src.close() def get_chunk_files(f): # pragma: no cover tar = tarfile.open(fileobj=f) @@ -386,8 +386,8 @@ class StratumBuilder(BuilderBase): constituents = [dependency for dependency in self.artifact.dependencies if dependency.source.morphology['kind'] == 'chunk'] - # the only reason the StratumBuilder has to download chunks is to check - # for overlap now that strata are lists of chunks + # the only reason the StratumBuilder has to download chunks is to + # check for overlap now that strata are lists of chunks with self.build_watch('check-chunks'): # download the chunk artifact if necessary download_depends(constituents, @@ -554,13 +554,13 @@ class SystemBuilder(BuilderBase): # pragma: no cover chunk_handle.close() f.close() meta = self.local_artifact_cache.get_artifact_metadata( - stratum_artifact, 'meta') - dst = morphlib.savefile.SaveFile( - os.path.join(path, 'baserock', - '%s.meta' % stratum_artifact.name), 'w') - shutil.copyfileobj(meta, dst) - dst.close() - meta.close() + stratum_artifact, 'meta') + dst = morphlib.savefile.SaveFile( + os.path.join(path, 'baserock', + '%s.meta' % stratum_artifact.name), 'w') + shutil.copyfileobj(meta, dst) + dst.close() + meta.close() ldconfig(self.app.runcmd, path) |