From f613c76092dbf0a58ab334262da478090c7b3ea8 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Sat, 14 Feb 2015 13:33:30 +0530 Subject: [PATCH 1/2] Improved MySQL setup --- ee/core/mysql.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ee/core/mysql.py b/ee/core/mysql.py index cc245ede..daf10aec 100644 --- a/ee/core/mysql.py +++ b/ee/core/mysql.py @@ -42,23 +42,23 @@ class EEMysql(): Log.error(self, 'Unable to connect to database: {0}' .format(e)) - try: - if log: - Log.debug(self, "Executing MySQL statement: {0}" - .format(statement)) + try: + if log: + Log.debug(self, "Executing MySQL statement: {0}" + .format(statement)) + + cur.execute(statement) + cur.close() + conn.close() - cur.execute(statement) - cur.close() - conn.close() - - except Exception as e: - cur.close() - conn.close() - Log.debug(self, "{0}".format(e)) - if not errormsg: - Log.error(self, 'Unable to execute statement') - else: - Log.error(self, '{0}'.format(errormsg)) + except Exception as e: + cur.close() + conn.close() + Log.debug(self, "{0}".format(e)) + if not errormsg: + Log.error(self, 'Unable to execute statement') + else: + Log.error(self, '{0}'.format(errormsg)) # def __del__(self): From 6df3d9818268cab603b9a2e550ca151a094dfdd3 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Sat, 14 Feb 2015 14:01:18 +0530 Subject: [PATCH 2/2] Fixed Wrong exit status of install script --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index e9892983..2ff8e4bf 100644 --- a/install +++ b/install @@ -319,6 +319,6 @@ else fi else ee_lib_echo_fail "You allready have EasyEngine $new_ee_version" | tee -ai $EE_INSTALL_LOG + exit 1 fi - exit 1 fi