From 282e22c001d0ab3006cb1540cb20376fbb73b0ea Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 24 Nov 2014 18:38:32 +0100 Subject: [PATCH] debugging --- bootstrapvz/base/manifest.py | 7 ------- bootstrapvz/base/remote/__init__.py | 9 ++++----- bootstrapvz/base/tasklist.py | 2 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/bootstrapvz/base/manifest.py b/bootstrapvz/base/manifest.py index 54eb5d6..576e31f 100644 --- a/bootstrapvz/base/manifest.py +++ b/bootstrapvz/base/manifest.py @@ -135,10 +135,3 @@ class Manifest(object): def __getstate__(self): return {'path': self.path, 'data': self.data} - - def __setstate__(self, vals): - self.path = vals.path - self.load(vals.data) - self.initialize() - self.validate() - self.parse() diff --git a/bootstrapvz/base/remote/__init__.py b/bootstrapvz/base/remote/__init__.py index 7185097..7367efb 100644 --- a/bootstrapvz/base/remote/__init__.py +++ b/bootstrapvz/base/remote/__init__.py @@ -34,11 +34,10 @@ def main(): server = manager.rpc_server # Everything has been set up, begin the bootstrapping process - ret = server.run(manifest, - debug=opts['--debug'], - pause_on_error=False, - dry_run=opts['--dry-run']) - logging.getLogger(__name__).info(ret) + server.run(manifest, + debug=opts['--debug'], + pause_on_error=False, + dry_run=opts['--dry-run']) finally: manager.stop() diff --git a/bootstrapvz/base/tasklist.py b/bootstrapvz/base/tasklist.py index 8e5dbb1..15cfd5d 100644 --- a/bootstrapvz/base/tasklist.py +++ b/bootstrapvz/base/tasklist.py @@ -21,6 +21,8 @@ class TaskList(object): :param dict info: The bootstrap information object :param bool dry_run: Whether to actually run the tasks or simply step through them """ + logging.getLogger(__name__).debug('test') + return # Create a list for us to run task_list = create_list(self.tasks) # Output the tasklist