Changeset 2876

Timestamp:

Nov 15, 2016, 5:13:41 PM (2 years ago)

Author:

Juanma

Message:

Fixed bug: exception when dbdump fails was trying to print an undefined variable

Location:

n4d-backup-manager/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• n4d-backup-manager.install/usr/share/n4d/python-plugins/support/BackupManager.py (modified) (3 diffs)

n4d-backup-manager/trunk/fuentes/debian/changelog

@@ +1 @@
+n4d-backup-manager (0.0.2-lliurex3) xenial; urgency=medium
+
+  * Fixed bug: exception when dbdump fails was trying to print an undefined variable
+
+ -- Juanma Navarro Mañez <juanma1980@gmail.com>  Tue, 15 Nov 2016 17:13:19 +0100
+
 n4d-backup-manager (0.0.2-lliurex2) xenial; urgency=medium
 

n4d-backup-manager/trunk/fuentes/n4d-backup-manager.install/usr/share/n4d/python-plugins/support/BackupManager.py

@@ -78 +78 @@
                         if self.app in self.apps_dbFiles:
                                 dbDumpFile=self.dumpDb(str(self.app))
-                                try:
+                                if dbDumpFile!='':
                                         if os.path.exists(dbDumpFile):
-                                                tar.add(dbDumpFile)
-                                except Exception as e:
-                                        print "%s database not found!!" % str(application)
-                                        pass
+                                                        tar.add(dbDumpFile)
+                                        else:
+                                                print "%s database not found!!" % str(self.app)
+                                else:
+                                        print "%s database not found!!" % str(self.app)
 
                         tar.close()
@@ -146 +147 @@
         def existsDb(self,dbName):
                 cmd='/usr/sbin/lliurex-sgbd --db_is_present ' + dbName
-                sp=subprocess.Popen(cmd,shell=True,stdout=subprocess.PIPE)
-                output=sp.communicate()
-                dbExists=str(output[0])
-                if dbExists.rstrip() == 'YES':
-                        dbExists=True
-                else:
+                try:
+                        sp=subprocess.Popen(cmd,shell=True,stdout=subprocess.PIPE)
+                        output=sp.communicate()
+                        dbExists=str(output[0])
+                        if dbExists.rstrip() == 'YES':
+                                dbExists=True
+                        else:
+                                dbExists=False
+                except: 
                         dbExists=False
-                
                 return dbExists
 
@@ -182 +185 @@
                                 return path+'/'+ dbName+".sql"
                         else:
-                                return False
+                                return ''
                 except Exception as e:
                         print e
-                        return [False,str(e)]
+                        pass
         
         def restoreDb(self,dbDump_path):