diff --git a/.gitignore b/.gitignore index 8fa0080..4e40893 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /simpleline-1.1.1.tar.gz +/simpleline-1.1.2.tar.gz diff --git a/0001-Always-close-the-password-dialog.patch b/0001-Always-close-the-password-dialog.patch deleted file mode 100644 index 7ece4d6..0000000 --- a/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/python-simpleline.spec b/python-simpleline.spec index 64875dd..62fe937 100644 --- a/python-simpleline.spec +++ b/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 diff --git a/sources b/sources index 8f7da9f..5c1766b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (simpleline-1.1.1.tar.gz) = 5de05aca67457e95de70d49129e4aac77832a20bb68ba59134140a1ac2edc54ae45f0c1a1e268a8b4237007dcbc2471216dbf86cd21d695a41dc7ea191a3fa38 +SHA512 (simpleline-1.1.2.tar.gz) = 01fef5fec2332878bec78f3808481df08860cd2e9851d925db9b9e6843c706c285b54e89f65bc538f8b6b471e6c327b45c3956d89563200fb93abffea750cb63