Changeset 2010

Timestamp:

Jun 24, 2016, 2:53:44 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

@@ -101 +101 @@
                                                 shutil.copy(tmp_path,f)
 
+                                #FIX for centralized services in Xenial
+                                version=objects["ServerBackupManager"].restoring_version
+                                majorBackupVersion=int(version[0:version.find('.')])
                                 for d in self.backup_dirs:
                                         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:
+                                                if d == self.dynamicconfpath and majorBackupVersion<=15:
                                                         #Read tmpdir and exclude centralized services 
                                                         centralizedServices=objects["VariablesManager"].get_variable('SLAVE_BLACKLIST')
-                                                        listServices=list(centralizedServices.values())
-                                                        for cnameFile in os.listdir(tmp_path):
-                                                                for service in listServices:
+                                                        configTmpDir=tmp_path+"config"
+                                                        configDir=d+"config"
+                                                        for cnameFile in os.listdir(configDir):
+                                                                for service in list(centralizedServices.values()):
                                                                         serviceStr=str(service)
                                                                         if cnameFile in serviceStr:
-                                                                                self.restore_as_centralized(cnameFile,d,tmp_path)
+                                                                                self.restore_as_centralized(cnameFile,configDir,configTmpDir)
                                                 cmd="cp -r " + tmp_path +"/* "  + d
                                                 os.system(cmd)
@@ -132 +133 @@
                         
         def restore_as_centralized (self,cnameFile=None,dest_dir=None,tmp_path=None):
-                cnameRealPath=d + '/' + cnameFile
+                cnameRealPath=dest_dir + '/' + cnameFile
                 if os.path.isfile(cnameRealPath):
-                        cmd="cp " + cnameRealPath + " tmp_path"
+                        cmd="cp " + cnameRealPath + " " + tmp_path
                         os.system(cmd)
                 elif  objects["VariablesManager"].get_variable("MASTER_SERVER_IP"):