update to 1.1.fb23-2

Signed-off-by: Andy Grover <agrover@redhat.com>
This commit is contained in:
Andy Grover 2017-05-23 12:23:48 -07:00
parent fd480fa0ba
commit ea05120597
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,31 @@
commit daa66bc6acd2430cdd05e9883dd1eab69b698252
Author: Andy Grover <agrover@redhat.com>
Date: Tue May 23 12:00:10 2017 -0700
Handle if TERM is not set
Previous patch causes problems otherwise in some cases.
Signed-off-by: Andy Grover <agrover@redhat.com>
diff --git a/configshell/shell.py b/configshell/shell.py
index c916366..e029c76 100644
--- a/configshell/shell.py
+++ b/configshell/shell.py
@@ -50,13 +50,14 @@ else:
tty=False
# remember the original setting
- oldTerm = os.environ['TERM']
+ oldTerm = os.environ.get('TERM')
os.environ['TERM'] = ''
import readline
# restore the orignal TERM setting
- os.environ['TERM'] = oldTerm
+ if oldTerm != None:
+ os.environ['TERM'] = oldTerm
del oldTerm
# Pyparsing helper to group the location of a token and its value

View File

@ -12,9 +12,10 @@ Group: System Environment/Libraries
Summary: A framework to implement simple but nice CLIs Summary: A framework to implement simple but nice CLIs
Epoch: 1 Epoch: 1
Version: 1.1.fb23 Version: 1.1.fb23
Release: 1%{?dist} Release: 2%{?dist}
URL: https://github.com/agrover/configshell-fb URL: https://github.com/agrover/configshell-fb
Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz
Patch0: configshell-fix-term.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python-devel python-setuptools BuildRequires: python-devel python-setuptools
Requires: pyparsing python-urwid python-six Requires: pyparsing python-urwid python-six
@ -40,6 +41,7 @@ command-line interfaces.
%prep %prep
%setup -q -n %{oname}-%{version} %setup -q -n %{oname}-%{version}
%patch0 -p1
%if 0%{?with_python3} %if 0%{?with_python3}
rm -rf %{py3dir} rm -rf %{py3dir}
@ -76,6 +78,9 @@ popd
%endif %endif
%changelog %changelog
* Tue May 23 2017 Andy Grover <agrover@redhat.com> - 1:1.1.fb23-2
- Add patch configshell-fix-term.patch
* Wed Mar 1 2017 Andy Grover <agrover@redhat.com> - 1:1.1.fb23-1 * Wed Mar 1 2017 Andy Grover <agrover@redhat.com> - 1:1.1.fb23-1
- New upstream release - New upstream release