Merge branch 'python' of github.com:rtCamp/easyengine into python

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):

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