From 7864832c6f8f0a71fc6cf79be980886dd3548fea Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 24 Sep 2022 10:11:32 +0000 Subject: [PATCH] import python-simpleline-1.1.2-1.el8 --- .gitignore | 2 +- .python-simpleline.metadata | 2 +- ...001-Always-close-the-password-dialog.patch | 42 ------------------- SPECS/python-simpleline.spec | 13 +++--- 4 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 SOURCES/0001-Always-close-the-password-dialog.patch diff --git a/.gitignore b/.gitignore index 513623a..70a1c94 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/simpleline-1.1.1.tar.gz +SOURCES/simpleline-1.1.2.tar.gz diff --git a/.python-simpleline.metadata b/.python-simpleline.metadata index 1537f1b..3eeff90 100644 --- a/.python-simpleline.metadata +++ b/.python-simpleline.metadata @@ -1 +1 @@ -da06a48d5c777b9909d213e23e9bcd6422fb7b43 SOURCES/simpleline-1.1.1.tar.gz +0d8caaee56c6e1d4a43418e3997ca6203838c235 SOURCES/simpleline-1.1.2.tar.gz diff --git a/SOURCES/0001-Always-close-the-password-dialog.patch b/SOURCES/0001-Always-close-the-password-dialog.patch deleted file mode 100644 index 7ece4d6..0000000 --- a/SOURCES/0001-Always-close-the-password-dialog.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8e0c75a0fbc4fc9496e1fcef0ce21fa8e28facc8 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Mon, 29 Jul 2019 18:28:18 +0200 -Subject: [PATCH] Always close the password dialog - -The password dialog should be closed even if no password is provided. -Otherwise, it is not possible to continue, because the UI is blocked. - -Resolves: rhbz#2121914 ---- - simpleline/render/adv_widgets.py | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/simpleline/render/adv_widgets.py b/simpleline/render/adv_widgets.py -index 781d2c5..58376ab 100644 ---- a/simpleline/render/adv_widgets.py -+++ b/simpleline/render/adv_widgets.py -@@ -87,14 +87,13 @@ class PasswordDialog(UIScreen): - return None - - self._password = handler.value -- if not self._password: -- return None -- else: -- # this may seem innocuous, but it's really a giant hack; we should -- # not be calling close() from prompt(), but the input handling code -- # in the TUI is such that without this very simple workaround, we -- # would be forever pelting users with a prompt to enter their pw -- self.close() -+ -+ # this may seem innocuous, but it's really a giant hack; we should -+ # not be calling close() from prompt(), but the input handling code -+ # in the TUI is such that without this very simple workaround, we -+ # would be forever pelting users with a prompt to enter their pw -+ self.close() -+ return None - - @property - def answer(self): --- -2.37.1 - diff --git a/SPECS/python-simpleline.spec b/SPECS/python-simpleline.spec index 64875dd..62fe937 100644 --- a/SPECS/python-simpleline.spec +++ b/SPECS/python-simpleline.spec @@ -3,15 +3,13 @@ Name: python-%{srcname} Summary: A Python library for creating text UI Url: https://github.com/rhinstaller/python-%{srcname} -Version: 1.1.1 -Release: 3%{?dist} +Version: 1.1.2 +Release: 1%{?dist} # This tarball was created from upstream git: # git clone https://github.com/rhinstaller/python-simpleline # cd python-simpleline && make archive Source0: https://github.com/rhinstaller/python-%{srcname}/archive/%{srcname}-%{version}.tar.gz -Patch0: 0001-Always-close-the-password-dialog.patch - License: GPLv2+ BuildArch: noarch BuildRequires: python3-devel @@ -43,7 +41,6 @@ Printed lines are never rewritten! %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 %build %make_build @@ -62,9 +59,9 @@ make test %{python3_sitelib}/* %changelog -* Thu Sep 1 2022 Radek Vykydal - 1.1.1-3 -- Always close the password dialog - Resolves: rhbz#2121914 +* Thu Sep 22 2022 Jiri Konecny - 1.1.2-1 +- Always close the password dialog (vponcova) + Resolves: rhbz#2125272 * Tue Aug 11 2020 Jiri Konecny - 1.1.1-2 - Fix file extension of gating.yaml