CondaInterface/CondaExecDialog.py

branch
conda
changeset 6741
33a82a20dd3a
parent 6717
afc972591ed2
--- a/CondaInterface/CondaExecDialog.py	Wed Feb 13 20:39:58 2019 +0100
+++ b/CondaInterface/CondaExecDialog.py	Wed Feb 13 20:41:45 2019 +0100
@@ -142,34 +142,34 @@
             self.__logOutput(self.__bufferedStdout)
         
         if self.__json and self.__bufferedStdout:
-                index = self.__bufferedStdout.find("{")
-                rindex = self.__bufferedStdout.rfind("}")
-                self.__bufferedStdout = self.__bufferedStdout[index:rindex + 1]
-                try:
-                    self.__result = json.loads(self.__bufferedStdout)
-                except Exception as error:
-                    self.__result = {}
-                    self.__logError(str(error))
-                    return
-                
-                if "error" in self.__result:
-                    self.__logError(self.__result["error"])
-                    self.__statusOk = False
-                elif "success" in self.__result and \
-                        not self.__result["success"]:
+            index = self.__bufferedStdout.find("{")
+            rindex = self.__bufferedStdout.rfind("}")
+            self.__bufferedStdout = self.__bufferedStdout[index:rindex + 1]
+            try:
+                self.__result = json.loads(self.__bufferedStdout)
+            except Exception as error:
+                self.__result = {}
+                self.__logError(str(error))
+                return
+            
+            if "error" in self.__result:
+                self.__logError(self.__result["error"])
+                self.__statusOk = False
+            elif "success" in self.__result and \
+                    not self.__result["success"]:
+                self.__logError(
+                    self.tr("Conda command '{0}' did not return success.")
+                    .format(self.__condaCommand))
+                if "message" in self.__result:
+                    self.__logError("\n")
                     self.__logError(
-                        self.tr("Conda command '{0}' did not return success.")
-                        .format(self.__condaCommand))
-                    if "message" in self.__result:
-                        self.__logError("\n")
-                        self.__logError(
-                            self.tr("\nConda Message: {0}").format(
-                                self.__result["message"]))
-                    self.__statusOk = False
-                elif "message" in self.__result:
-                    self.__logOutput(
                         self.tr("\nConda Message: {0}").format(
                             self.__result["message"]))
+                self.__statusOk = False
+            elif "message" in self.__result:
+                self.__logOutput(
+                    self.tr("\nConda Message: {0}").format(
+                        self.__result["message"]))
     
     def getResult(self):
         """

eric ide

mercurial