- Add cloud-init-ostack-metadat-dencode.patch (bsc#1101894)
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=124
This commit is contained in:
parent
37fdad8a72
commit
a76ae619ee
14
cloud-init-ostack-metadat-dencode.patch
Normal file
14
cloud-init-ostack-metadat-dencode.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- cloudinit/sources/helpers/openstack.py.orig
|
||||
+++ cloudinit/sources/helpers/openstack.py
|
||||
@@ -291,7 +291,10 @@ class BaseReader(object):
|
||||
if 'random_seed' in metadata:
|
||||
random_seed = metadata['random_seed']
|
||||
try:
|
||||
- metadata['random_seed'] = base64.b64decode(random_seed)
|
||||
+ metadata['random_seed'] = u'%s' % base64.b64decode(random_seed)
|
||||
+ except UnicodeDecodeError:
|
||||
+ # Did not decode as expected, probably utf-8 already
|
||||
+ metadata['random_seed'] = random_seed
|
||||
except (ValueError, TypeError) as e:
|
||||
raise BrokenMetadata("Badly formatted metadata"
|
||||
" random_seed entry: %s" % e)
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 2 14:13:42 UTC 2018 - Robert Schweikert <rjschwei@suse.com>
|
||||
|
||||
- Add cloud-init-ostack-metadat-dencode.patch (bsc#1101894)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 31 14:27:32 UTC 2018 - Robert Schweikert <rjschwei@suse.com>
|
||||
|
||||
|
@ -51,6 +51,8 @@ Patch39: cloud-init-sysconf-ethsetup.patch
|
||||
Patch40: 0001-Fix-the-service-order-for-SUSE-distributions.patch
|
||||
# FIXME (lp# 1800854)
|
||||
Patch41: cloud-init-static-net.patch
|
||||
# FIXME (lp#1801364)
|
||||
Patch42: cloud-init-ostack-metadat-dencode.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: filesystem
|
||||
@ -197,6 +199,7 @@ Documentation and examples for cloud-init tools
|
||||
%patch39 -p1
|
||||
%patch40 -p1
|
||||
%patch41
|
||||
%patch42
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
|
||||
|
Loading…
Reference in New Issue
Block a user