diff options
Diffstat (limited to 'cloudinit/__init__.py')
| -rw-r--r-- | cloudinit/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index 64c260e9..9384bf11 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -102,6 +102,7 @@ def logging_set_from_cfg(cfg): import DataSource +DataSource.setlog(log) import UserDataHandler class CloudInit: @@ -153,6 +154,7 @@ class CloudInit: cache = get_ipath_cur('obj_pkl') f=open(cache, "rb") data = cPickle.load(f) + f.close() self.datasource = data return True except: @@ -169,10 +171,10 @@ class CloudInit: try: f=open(cache, "wb") data = cPickle.dump(self.datasource,f) + f.close() os.chmod(cache,0400) - return True except: - return False + raise def get_data_source(self): if self.datasource is not None: return True @@ -188,7 +190,7 @@ class CloudInit: for cls in dslist: ds = cls.__name__ try: - s = cls(log) + s = cls() if s.get_data(): self.datasource = s self.datasource_name = ds |