Changeset 2007

Timestamp:

Jun 24, 2016, 12:30:30 PM (3 years ago)

Author:

Juanma

Message:

Fix bug on backup from Trusty

File:

• n4d-dnsmasq/trunk/fuentes/install-dnsmasq/usr/share/n4d/python-plugins/DnsmasqManager.py (modified) (2 diffs)

n4d-dnsmasq/trunk/fuentes/install-dnsmasq/usr/share/n4d/python-plugins/DnsmasqManager.py

@@ -104 +104 @@
                                         tmp_path=tmp_dir+d
                                         if os.path.exists(tmp_path):
+                                                self.makedir(d)
                                                 #FIX for centralized services in Xenial
                                                 version=objects["ServerBackupManager"].restoring_version
                                                 majorBackupVersion=int(version[0:version.find('.')])
-                                                if majorBackupVersion<=15 and objects['VariablesManager'].getvalues('MASTER_SERVER_IP'):
+                                                if majorBackupVersion<=15:
                                                         #Read tmpdir and exclude centralized services 
-                                                        centralizedServices = objects['VariablesManager'].getvalues('SLAVE_BLACKLIST')
-                                                        for cnameFile in listdir(tmp_path):
-                                                                if cnameFile in centralizedServices.values():
-                                                                        restore_as_centralized(cnameFile,d,tmp_path)
-                                                self.makedir(d)
+                                                        centralizedServices=objects["VariablesManager"].get_variable('SLAVE_BLACKLIST')
+                                                        listServices=list(centralizedServices.values())
+                                                        for cnameFile in os.listdir(tmp_path):
+                                                                for service in listServices:
+                                                                        serviceStr=str(service)
+                                                                        if cnameFile in serviceStr:
+                                                                                self.restore_as_centralized(cnameFile,d,tmp_path)
                                                 cmd="cp -r " + tmp_path +"/* "  + d
                                                 os.system(cmd)
@@ -128 +131 @@
                         return [False,str(e)]
                         
-        def restore_as_centralized (self,cnameFile,backup_dir,tmp_path):
-                cnameRealPath=backup_dir + '/' + cnameFile
+        def restore_as_centralized (self,cnameFile=None,dest_dir=None,tmp_path=None):
+                cnameRealPath=d + '/' + cnameFile
                 if os.path.isfile(cnameRealPath):
                         cmd="cp " + cnameRealPath + " tmp_path"
                         os.system(cmd)
-                else:
+                elif  objects["VariablesManager"].get_variable("MASTER_SERVER_IP"):
                         os.remove(cnameFile)