From 1aaf41cad0dc21c592e684ac7a1fa71d65ba36bd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 07:03:58 +0000 Subject: import python-configshell-1.1.26-1.el7 --- diff --git a/.gitignore b/.gitignore index 9671da0..89cf450 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/configshell-fb-1.1.fb25.tar.gz +SOURCES/configshell-fb-1.1.26.tar.gz diff --git a/.python-configshell.metadata b/.python-configshell.metadata index 4ab2ee0..23ea908 100644 --- a/.python-configshell.metadata +++ b/.python-configshell.metadata @@ -1 +1 @@ -ed1da92035703003368cf5c7141dd4faa09ce1b8 SOURCES/configshell-fb-1.1.fb25.tar.gz +728cdd8a367f6386e710857c909b44b3c3ea96c7 SOURCES/configshell-fb-1.1.26.tar.gz diff --git a/SOURCES/0001-Ensure-that-all-output-reaches-the-client-when-daemo.patch b/SOURCES/0001-Ensure-that-all-output-reaches-the-client-when-daemo.patch new file mode 100644 index 0000000..6005a61 --- /dev/null +++ b/SOURCES/0001-Ensure-that-all-output-reaches-the-client-when-daemo.patch @@ -0,0 +1,25 @@ +From 949c674b807ddfb312cbac234b1b995066c77dad Mon Sep 17 00:00:00 2001 +From: Matt Coleman +Date: Thu, 7 Nov 2019 19:43:57 -0500 +Subject: [PATCH] Ensure that all output reaches the client when daemonized + +--- + configshell/console.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configshell/console.py b/configshell/console.py +index 8ed6b50..003a855 100644 +--- a/configshell/console.py ++++ b/configshell/console.py +@@ -191,7 +191,7 @@ class Console(object): + break + else: + clean_text = text +- self.raw_write(clean_text) ++ self.raw_write(clean_text, output=self._stdout) + + def indent(self, text, margin=2): + ''' +-- +2.21.0 + diff --git a/SPECS/python-configshell.spec b/SPECS/python-configshell.spec index bdf1b1b..cebad2d 100644 --- a/SPECS/python-configshell.spec +++ b/SPECS/python-configshell.spec @@ -7,10 +7,11 @@ License: ASL 2.0 Group: System Environment/Libraries Summary: A framework to implement simple but nice CLIs Epoch: 1 -Version: 1.1.fb25 +Version: 1.1.26 Release: 1%{?dist} -URL: https://fedorahosted.org/targetcli-fb/ -Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz +URL: https://github.com/open-iscsi/%{oname} +Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz +Patch0: 0001-Ensure-that-all-output-reaches-the-client-when-daemo.patch BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: pyparsing python-urwid python-six @@ -21,6 +22,7 @@ command-line interfaces. %prep %setup -q -n %{oname}-%{version} +%patch0 -p1 %build %{__python} setup.py build @@ -34,6 +36,9 @@ rm -rf %{buildroot} %doc COPYING README.md %changelog +* Fri Apr 03 2020 Maurizio Lombardi - 1.1.26-1 +- Rebase to the latest upstream version + * Wed Jan 30 2019 Maurizio Lombardi - 1:1.1.fb25-1 - Rebase python-configshell to the latest upstream version