diff --git a/0001-Always-close-the-password-dialog.patch b/0001-Always-close-the-password-dialog.patch new file mode 100644 index 0000000000000000000000000000000000000000..7ece4d673aa7334e9ed1d91dff651ae4a7b5e947 --- /dev/null +++ b/0001-Always-close-the-password-dialog.patch @@ -0,0 +1,42 @@ +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/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..7aa2f4840f2fea0d88ff319ae226977702793dbc --- /dev/null +++ b/download @@ -0,0 +1 @@ +100c88fcdb9ae29939273002d1aff317 simpleline-1.1.1.tar.gz diff --git a/python-simpleline.spec b/python-simpleline.spec index 96a234819e96f60df71969d44ebac8109b1186a8..4aa07a4a91bd5cac18a226de7dcc1995d3d80098 100644 --- a/python-simpleline.spec +++ b/python-simpleline.spec @@ -6,12 +6,14 @@ Name: python-%{srcname} Summary: A Python library for creating text UI Url: https://github.com/rhinstaller/python-%{srcname} Version: 1.1.1 -Release: 2%{anolis_release}%{?dist} +Release: 3%{anolis_release}%{?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 @@ -51,6 +53,7 @@ Doc pages for %{name}. %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 %build %make_build @@ -71,9 +74,13 @@ make test %doc ChangeLog README.md %changelog -* Wed Jul 20 2022 DengXiewei - 1.1.1-2.0.1 +* Fri Dec 23 2022 DengXiewei - 1.1.1-3.0.1 - Add doc sub package +* Thu Sep 1 2022 Radek Vykydal - 1.1.1-3 +- Always close the password dialog + Resolves: rhbz#2121914 + * Tue Aug 11 2020 Jiri Konecny - 1.1.1-2 - Fix file extension of gating.yaml diff --git a/simpleline-1.1.1.tar.gz b/simpleline-1.1.1.tar.gz deleted file mode 100644 index 272e202298adc435d3d0111b56695333373f655b..0000000000000000000000000000000000000000 Binary files a/simpleline-1.1.1.tar.gz and /dev/null differ