diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-05-23 17:00:16 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-05-24 15:53:28 +0100 |
| commit | 182cae2a1a3e743d031cd35ba3f77b5a280cd63b (patch) | |
| tree | 181ee798ea2c3039d643f4f803b279d650dbbb31 | |
| parent | 54bc976b363bd34dfd39ba343530b8bc42cb0715 (diff) | |
| download | morph-182cae2a1a3e743d031cd35ba3f77b5a280cd63b.tar.gz | |
Remove excessive debugging messages
| -rw-r--r-- | morphlib/bins.py | 4 | ||||
| -rw-r--r-- | morphlib/builder2.py | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/morphlib/bins.py b/morphlib/bins.py index 1721c69a..3c6f2c88 100644 --- a/morphlib/bins.py +++ b/morphlib/bins.py @@ -72,7 +72,6 @@ def chunk_filenames(rootdir, regexps, dump_memory_profile=None): filename = os.path.dirname(filename) yield filename - logging.debug('regexps: %s' % repr(regexps)) compiled = [re.compile(x) for x in regexps] include = set() for dirname, subdirs, basenames in os.walk(rootdir): @@ -83,7 +82,6 @@ def chunk_filenames(rootdir, regexps, dump_memory_profile=None): if matches(os.path.relpath(filename, rootdir)): for name in names_to_root(filename): if name not in include: - logging.debug('regexp match: %s' % name) include.add(name) else: logging.debug('regexp MISMATCH: %s' % filename) @@ -121,8 +119,6 @@ def create_chunk(rootdir, f, regexps, dump_memory_profile=None): normalized_timestamp = 683074800 include = chunk_filenames(rootdir, regexps, dump_memory_profile) - logging.debug('Creating chunk file %s from %s with regexps %s' % - (getattr(f, 'name', 'UNNAMED'), rootdir, regexps)) dump_memory_profile('at beginning of create_chunk') tar = tarfile.open(fileobj=f, mode='w') diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 086b3033..9aefabb6 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -186,7 +186,7 @@ class BuilderBase(object): json.dump(meta, f, indent=4, sort_keys=True) f.write('\n') - def create_metadata(self, artifact_name, contents = []): + def create_metadata(self, artifact_name, contents=[]): '''Create metadata to artifact to allow it to be reproduced later. The metadata is represented as a dict, which later on will be @@ -226,7 +226,7 @@ class BuilderBase(object): os.makedirs(dirname) return open(filename, mode) - def write_metadata(self, instdir, artifact_name, contents = []): + def write_metadata(self, instdir, artifact_name, contents=[]): '''Write the metadata for an artifact. The file will be located under the ``baserock`` directory under @@ -445,7 +445,6 @@ class ChunkBuilder(BuilderBase): with self.local_artifact_cache.put(artifact) as f: contents = morphlib.bins.chunk_contents(destdir, patterns) - logging.debug('metadata contents: %s' % contents) self.write_metadata(destdir, artifact_name, contents) logging.debug('assembling chunk %s' % artifact_name) |