← Back to branch summary

~mathiaz/ec2-init/bzr-bd-split-mode

« back to all changes in this revision

Viewing changes to ec2init/__init__.py

  • Committer: Scott Moser
  • Date: 2010-01-22 18:59:25 UTC
  • Revision ID: smoser@ubuntu.com-20100122185925-jb3147ksg4ouna7d
function ec2 metadata service removal. also fix issues with empty cloud-config

Show diffs side-by-side

added added

removed removed

Lines of Context:
ec2init/__init__.py
73
73
                stream.close()
74
74
        except:
75
75
            pass
 
76
            
 
77
        if conf is None: conf = { }
76
78
 
77
79
        # support reading the old ConfigObj format file and merging
78
80
        # it into the yaml dictionary
79
81
        try:
80
82
            from configobj import ConfigObj
81
83
            oldcfg = ConfigObj(self.old_conffile)
 
84
            if oldcfg is None: oldcfg = { }
82
85
            conf = util.mergedict(conf,oldcfg)
83
86
        except:
84
87
            pass