summaryrefslogtreecommitdiff
path: root/hplip-dialog-infinite-loop.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-08-05 02:45:17 +0000
committerCoprDistGit <infra@openeuler.org>2024-08-05 02:45:17 +0000
commit92ff4cdf8c84e91584dd6076aa5b3c774ab0a622 (patch)
tree6ba01d84d85f00b380477077d920c341c3570b09 /hplip-dialog-infinite-loop.patch
parentd8ce4006ffe8011c16c265205aa330c52a0de0c1 (diff)
automatic import of hplipopeneuler24.03_LTS
Diffstat (limited to 'hplip-dialog-infinite-loop.patch')
-rw-r--r--hplip-dialog-infinite-loop.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/hplip-dialog-infinite-loop.patch b/hplip-dialog-infinite-loop.patch
new file mode 100644
index 0000000..dbb04e7
--- /dev/null
+++ b/hplip-dialog-infinite-loop.patch
@@ -0,0 +1,34 @@
+diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
+index c23957a..48b248f 100644
+--- a/ui5/devmgr5.py
++++ b/ui5/devmgr5.py
+@@ -2247,7 +2247,7 @@ class PasswordDialog(QDialog):
+ self.prompt = prompt
+
+ Layout= QGridLayout(self)
+- Layout.setMargin(11)
++ Layout.setContentsMargins(11, 11, 11, 11)
+ Layout.setSpacing(6)
+
+ self.PromptTextLabel = QLabel(self)
+@@ -2300,14 +2300,15 @@ class PasswordDialog(QDialog):
+ # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+ def showPasswordUI(prompt):
++ dlg = None
++
+ try:
+ dlg = PasswordDialog(prompt, None)
++ except Exception as e:
++ log.error('Unable to open password dialog due following error:\n {}'.format(e))
+
+- if dlg.exec_() == QDialog.Accepted:
+- return (dlg.getUsername(), dlg.getPassword())
+-
+- finally:
+- pass
++ if dlg and dlg.exec_() == QDialog.Accepted:
++ return (dlg.getUsername(), dlg.getPassword())
+
+ return ("", "")
+