rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

- Decoding error (boo#998843)

Browse Source 
+ Added cloud-init-fix-unicode-handling-binarydecode.patch
- Fix dependencies, depends on oauthlib instead of oauth
- Fix dataSourceOpenNebula.patch, missing closing paren (boo#998836)

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=46
This commit is contained in:
Robert Schweikert 2016-09-15 16:41:25 +00:00 committed by Git OBS Bridge
parent 58376ea864
commit daf356ec1b
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloud-init-fix-unicode-handling-binarydecode.patch Normal file
View File

@ -0,0 +1,11 @@
--- cloudinit/util.py.orig
+++ cloudinit/util.py
@@ -154,7 +154,7 @@ def target_path(target, path=None):
def decode_binary(blob, encoding='utf-8'):
# Converts a binary type into a text type using given encoding.
- if isinstance(blob, six.text_type):
+ if isinstance(blob, six.string_types):
return blob
return blob.decode(encoding)

9
cloud-init.changes
View File

@ -1,7 +1,14 @@
-------------------------------------------------------------------
Thu Sep 15 13:01:35 UTC 2016 - rjschwei@suse.com
- Decoding error (boo#998843)
+ Added cloud-init-fix-unicode-handling-binarydecode.patch
- Fix dependencies, depends on oauthlib instead of oauth
-------------------------------------------------------------------
Wed Sep 14 14:24:07 UTC 2016 - rjschwei@suse.com
- Fix dataSourceOpenNebula.patch, missing closing paren
- Fix dataSourceOpenNebula.patch, missing closing paren (boo#998836)
-------------------------------------------------------------------
Wed Sep 14 12:24:55 UTC 2016 - rjschwei@suse.com

5
cloud-init.spec
View File

@ -44,6 +44,7 @@ Patch14: cloud-init-finalbeforelogin.patch
Patch20: cloud-init-python2-sigpipe.patch
Patch21: cloud-init-net-eni.patch
Patch22: cloud-init-service.patch
Patch23: cloud-init-fix-unicode-handling-binarydecode.patch
BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: python-devel
@ -61,11 +62,12 @@ Requires: python-cheetah
Requires: python-configobj
Requires: python-Jinja2
Requires: python-jsonpatch
Requires: python-oauth
Requires: python-oauthlib
Requires: python-PrettyTable
Requires: python-pyserial
Requires: python-PyYAML
Requires: python-requests
Requires: python-setuptools
Requires: python-xml
Requires: sudo
Requires: util-linux
@ -146,6 +148,7 @@ Unit tests for the cloud-init tools
%patch20
%patch21
%patch22
%patch23
%if 0%{?suse_version} <= 1130
# disable ecdsa for SLE 11 (not available)