Compare commits

...

5 Commits

Author SHA1 Message Date
David Abdurachmanov 87da9acfaf
Merge remote-tracking branch 'up/f29' into f29-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-10-06 08:44:52 +03:00
David Cantrell 16debff89b New release: 3.16 (dcantrell)
Remove the extra space from the logvol command (vponcova)
Support LUKS2 in the raid command (vponcova)
Support LUKS2 in the part command (vponcova)
Support LUKS2 in the logvol command (vponcova)
Support LUKS2 in the autopart command (vponcova)
Remove unused false positive (vponcova)
Wrong hanging indentation (vponcova)
2018-08-09 14:53:26 -04:00
David Cantrell 438107af27 New release: 3.16 (dcantrell)
Remove the extra space from the logvol command (vponcova)
Support LUKS2 in the raid command (vponcova)
Support LUKS2 in the part command (vponcova)
Support LUKS2 in the logvol command (vponcova)
Support LUKS2 in the autopart command (vponcova)
Remove unused false positive (vponcova)
Wrong hanging indentation (vponcova)
2018-08-09 14:52:59 -04:00
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
4 changed files with 32 additions and 3 deletions

1
.gitignore vendored
View File

@ -187,3 +187,4 @@ pykickstart-1.78.tar.gz
/pykickstart-3.13.tar.gz
/pykickstart-3.14.tar.gz
/pykickstart-3.15.tar.gz
/pykickstart-3.16.tar.gz

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

@ -10,8 +10,8 @@
%bcond_with runtests
Name: pykickstart
Version: 3.15
Release: 2%{?dist}
Version: 3.16
Release: 1.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,19 @@ make PYTHON=%{__python3} test
%{python3_sitelib}/pykickstart*.egg-info
%changelog
* Sat Oct 06 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 3.16-1.0.riscv64
- Fix UnicodeDecodeError while generating packages list
* Thu Aug 09 2018 David Cantrell <dcantrell@redhat.com> - 3.16-1
- New release: 3.16 (dcantrell)
- Remove the extra space from the logvol command (vponcova)
- Support LUKS2 in the raid command (vponcova)
- Support LUKS2 in the part command (vponcova)
- Support LUKS2 in the logvol command (vponcova)
- Support LUKS2 in the autopart command (vponcova)
- Remove unused false positive (vponcova)
- Wrong hanging indentation (vponcova)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (pykickstart-3.15.tar.gz) = 94da465e342e8dc10dc295499ec1032aef9d1d02e94245b478c839d91947b14416c3fe535b74dc7c60532cd76434869ea10df1cd1ab2ae49f7eafb5076df93e2
SHA512 (pykickstart-3.16.tar.gz) = e48a1af629d9766b80c86ba2136ca0b45be282a081a173281fbce678eccd66bf320d0667a65462ea67867afcb31d6eb5c0191c2d39d4bde6ba7174e9f1bd64cc