From a76ae619eeb9fcd1c8915fb76912329b7c543ab252add639087ce4b16ced518e Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 2 Nov 2018 14:21:08 +0000 Subject: [PATCH] - 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 --- cloud-init-ostack-metadat-dencode.patch | 14 ++++++++++++++ cloud-init.changes | 5 +++++ cloud-init.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 cloud-init-ostack-metadat-dencode.patch diff --git a/cloud-init-ostack-metadat-dencode.patch b/cloud-init-ostack-metadat-dencode.patch new file mode 100644 index 0000000..bf4aea7 --- /dev/null +++ b/cloud-init-ostack-metadat-dencode.patch @@ -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) diff --git a/cloud-init.changes b/cloud-init.changes index 78b4a8b..836cd39 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 2 14:13:42 UTC 2018 - Robert Schweikert + +- Add cloud-init-ostack-metadat-dencode.patch (bsc#1101894) + ------------------------------------------------------------------- Wed Oct 31 14:27:32 UTC 2018 - Robert Schweikert diff --git a/cloud-init.spec b/cloud-init.spec index af0774e..ac3b221 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -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