Compare commits

...

2 Commits

Author SHA1 Message Date
David Abdurachmanov a92eb32654
Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-08-03 20:04:57 +03:00
David Abdurachmanov 5c556c71e6
Fix UnicodeDecodeError while generating packages list
Resolves:

    DEBUG util.py:482:  BUILDSTDERR: Traceback (most recent call last):
    DEBUG util.py:482:  BUILDSTDERR:   File "/usr/bin/appliance-creator", line 173, in <module>
    DEBUG util.py:482:  BUILDSTDERR:     sys.exit(main())
    DEBUG util.py:482:  BUILDSTDERR:   File "/usr/bin/appliance-creator", line 152, in main
    DEBUG util.py:482:  BUILDSTDERR:     creator.configure()
    DEBUG util.py:482:  BUILDSTDERR:   File "/usr/lib/python2.7/site-packages/imgcreate/creator.py", line 801, in configure
    DEBUG util.py:482:  BUILDSTDERR:     self._create_bootconfig()
    DEBUG util.py:482:  BUILDSTDERR:   File "/usr/lib/python2.7/site-packages/appcreate/appliance.py", line 516, in _create_bootconfig
    DEBUG util.py:482:  BUILDSTDERR:     self._write_kickstart()
    DEBUG util.py:482:  BUILDSTDERR:   File "/usr/lib/python2.7/site-packages/appcreate/appliance.py", line 681, in _write_kickstart
    DEBUG util.py:482:  BUILDSTDERR:     ks.write("%s" % (self.ks.handler,))
    DEBUG util.py:482:  BUILDSTDERR:   File "/usr/lib/python2.7/site-packages/pykickstart/base.py", line 482, in __str__
    DEBUG util.py:482:  BUILDSTDERR:     retval += self.packages.__str__()
    DEBUG util.py:482:  BUILDSTDERR: UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 1643: ordinal not in range(128)

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-06-16 07:10:31 +02:00
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/pykickstart/base.py b/pykickstart/base.py
index f695dcc..09135f6 100644
--- a/pykickstart/base.py
+++ b/pykickstart/base.py
@@ -479,7 +479,7 @@ class BaseHandler(KickstartHandler):
for s in self._null_section_strings:
retval += s
- retval += self.packages.__str__()
+ retval += str(self.packages)
return retval

View File

@ -11,7 +11,7 @@
Name: pykickstart
Version: 3.15
Release: 2%{?dist}
Release: 2.0.riscv64%{?dist}
License: GPLv2 and MIT
Group: System Environment/Libraries
Summary: Python utilities for manipulating kickstart files.
@ -20,6 +20,7 @@ Url: http://fedoraproject.org/wiki/pykickstart
# our distribution. Thus the source is only available from
# within this srpm.
Source0: %{name}-%{version}.tar.gz
Patch0: pykickstart-3.14-fix-UnicodeDecodeError.patch
BuildArch: noarch
@ -77,6 +78,7 @@ the pykickstart package.
%prep
%setup -q
%patch0 -p1
%if %{with python2}
rm -rf %{py3dir}
@ -139,6 +141,9 @@ make PYTHON=%{__python3} test
%{python3_sitelib}/pykickstart*.egg-info
%changelog
* Fri Aug 03 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 3.15-2.0.riscv64
- Fix UnicodeDecodeError while generating packages list
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild