Mercurial Repositories > eric / file comparison
comparison: eric6/CondaInterface/CondaExecDialog.py
eric6/CondaInterface/CondaExecDialog.py
- changeset 7250
- d8bdc55aee1a
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7249:0bf517e60f54 | 7250:d8bdc55aee1a |
|---|---|
| 115 @param exitStatus exit status of the process | 115 @param exitStatus exit status of the process |
| 116 @type QProcess.ExitStatus | 116 @type QProcess.ExitStatus |
| 117 @param giveUp flag indicating to not start another attempt | 117 @param giveUp flag indicating to not start another attempt |
| 118 @type bool | 118 @type bool |
| 119 """ | 119 """ |
| 120 if self.__process is not None and \ | 120 if (self.__process is not None and |
| 121 self.__process.state() != QProcess.NotRunning: | 121 self.__process.state() != QProcess.NotRunning): |
| 122 self.__process.terminate() | 122 self.__process.terminate() |
| 123 QTimer.singleShot(2000, self.__process.kill) | 123 QTimer.singleShot(2000, self.__process.kill) |
| 124 self.__process.waitForFinished(3000) | 124 self.__process.waitForFinished(3000) |
| 125 | 125 |
| 126 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) | 126 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
| 148 return | 148 return |
| 149 | 149 |
| 150 if "error" in self.__result: | 150 if "error" in self.__result: |
| 151 self.__logError(self.__result["error"]) | 151 self.__logError(self.__result["error"]) |
| 152 self.__statusOk = False | 152 self.__statusOk = False |
| 153 elif "success" in self.__result and \ | 153 elif ("success" in self.__result and |
| 154 not self.__result["success"]: | 154 not self.__result["success"]): |
| 155 self.__logError( | 155 self.__logError( |
| 156 self.tr("Conda command '{0}' did not return success.") | 156 self.tr("Conda command '{0}' did not return success.") |
| 157 .format(self.__condaCommand)) | 157 .format(self.__condaCommand)) |
| 158 if "message" in self.__result: | 158 if "message" in self.__result: |
| 159 self.__logError("\n") | 159 self.__logError("\n") |
