From fff3964332a7d782ca1b6c92aec1e2491f124ee4 Mon Sep 17 00:00:00 2001 From: Ian Southam Date: Wed, 13 Aug 2014 14:27:58 +0200 Subject: [PATCH] Add catchall for unknown types --- .../debian/config/opt/cloud/bin/merge.py | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/config/opt/cloud/bin/merge.py index effe8018553..a71cb559d57 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py @@ -60,22 +60,25 @@ class updateDataBag: self.process() def process(self): - self.db = dataBag() - self.db.setKey( self.qFile.type ) - dbag = self.db.load( ) - logging.info("Command of type %s received", self.qFile.type) + self.db = dataBag() + self.db.setKey( self.qFile.type ) + dbag = self.db.load( ) + logging.info("Command of type %s received", self.qFile.type) - if self.qFile.type == 'ips': - dbag = self.processIP(self.db.getDataBag()) - if self.qFile.type == 'guestnetwork': - dbag = self.processGuestNetwork(self.db.getDataBag()) - if self.qFile.type == 'cmdline': - dbag = self.processCL(self.db.getDataBag()) - if self.qFile.type == 'cmdline': - dbag = self.processCL(self.db.getDataBag()) - if self.qFile.type == 'vmpassword': - dbag = self.processVMpassword(self.db.getDataBag()) - self.db.save(dbag) + if self.qFile.type == 'ips': + dbag = self.processIP(self.db.getDataBag()) + elif self.qFile.type == 'guestnetwork': + dbag = self.processGuestNetwork(self.db.getDataBag()) + elif self.qFile.type == 'cmdline': + dbag = self.processCL(self.db.getDataBag()) + elif self.qFile.type == 'cmdline': + dbag = self.processCL(self.db.getDataBag()) + elif self.qFile.type == 'vmpassword': + dbag = self.processVMpassword(self.db.getDataBag()) + else: + logging.error("Error I do not know what to do with file of type %s", self.qFile.type) + return + self.db.save(dbag) def processGuestNetwork(self, dbag): d = self.qFile.data