Blame SOURCES/hplip-dialog-infinite-loop.patch
|
 |
b1d80f |
diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
|
|
|
b1d80f |
index c23957a..48b248f 100644
|
|
|
b1d80f |
--- a/ui5/devmgr5.py
|
|
|
b1d80f |
+++ b/ui5/devmgr5.py
|
|
|
b1d80f |
@@ -2247,7 +2247,7 @@ class PasswordDialog(QDialog):
|
|
|
b1d80f |
self.prompt = prompt
|
|
|
b1d80f |
|
|
|
b1d80f |
Layout= QGridLayout(self)
|
|
|
b1d80f |
- Layout.setMargin(11)
|
|
|
b1d80f |
+ Layout.setContentsMargins(11, 11, 11, 11)
|
|
|
b1d80f |
Layout.setSpacing(6)
|
|
|
b1d80f |
|
|
|
b1d80f |
self.PromptTextLabel = QLabel(self)
|
|
|
b1d80f |
@@ -2300,14 +2300,15 @@ class PasswordDialog(QDialog):
|
|
|
b1d80f |
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
|
|
b1d80f |
|
|
|
b1d80f |
def showPasswordUI(prompt):
|
|
|
b1d80f |
+ dlg = None
|
|
|
b1d80f |
+
|
|
|
b1d80f |
try:
|
|
|
b1d80f |
dlg = PasswordDialog(prompt, None)
|
|
|
b1d80f |
+ except Exception as e:
|
|
|
b1d80f |
+ log.error('Unable to open password dialog due following error:\n {}'.format(e))
|
|
|
b1d80f |
|
|
|
b1d80f |
- if dlg.exec_() == QDialog.Accepted:
|
|
|
b1d80f |
- return (dlg.getUsername(), dlg.getPassword())
|
|
|
b1d80f |
-
|
|
|
b1d80f |
- finally:
|
|
|
b1d80f |
- pass
|
|
|
b1d80f |
+ if dlg and dlg.exec_() == QDialog.Accepted:
|
|
|
b1d80f |
+ return (dlg.getUsername(), dlg.getPassword())
|
|
|
b1d80f |
|
|
|
b1d80f |
return ("", "")
|
|
|
b1d80f |
|