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

Accepting request 905232 from home:alarrosa:branches:openSUSE:Factory:Rings:1-MinimalX

Browse Source 
- Add patch from upstream to remove python2 compatibility so
  cloud-init builds fine in Tumbleweed with a recent Jinja2
  version. This patch is only applied in TW.
  * 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch

OBS-URL: https://build.opensuse.org/request/show/905232
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=187
This commit is contained in:
Robert Schweikert 2021-07-09 13:55:49 +00:00 committed by Git OBS Bridge
parent 1c5c88721b
commit d4ebc226a3
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-templater-drop-Jinja-Python-2-compatibility-shim.patch Normal file
View File

@ -0,0 +1,49 @@
From f23a4c4262ac11cd75c99fcbfbfe453f4e115f18 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <oddbloke@ubuntu.com>
Date: Thu, 14 May 2020 23:22:27 -0400
Subject: [PATCH] templater: drop Jinja Python 2 compatibility shim (#353)
---
cloudinit/helpers.py | 4 ----
cloudinit/templater.py | 4 ----
2 files changed, 8 deletions(-)
diff --git a/cloudinit/helpers.py b/cloudinit/helpers.py
index 7d2a330582..9752ad2831 100644
--- a/cloudinit/helpers.py
+++ b/cloudinit/helpers.py
@@ -451,8 +451,4 @@ def stringify(self, header=None):
contents = '\n'.join([header, contents, ''])
return contents
-
-def identity(object):
- return object
-
# vi: ts=4 expandtab
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index e47cdedaf7..a00ade200c 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -21,13 +21,10 @@
CHEETAH_AVAILABLE = False
try:
- from jinja2.runtime import implements_to_string
from jinja2 import Template as JTemplate
from jinja2 import DebugUndefined as JUndefined
JINJA_AVAILABLE = True
except (ImportError, AttributeError):
- from cloudinit.helpers import identity
- implements_to_string = identity
JINJA_AVAILABLE = False
JUndefined = object
@@ -42,7 +39,6 @@
MISSING_JINJA_PREFIX = u'CI_MISSING_JINJA_VAR/'
-@implements_to_string # Needed for python2.7. Otherwise cached super.__str__
class UndefinedJinjaVariable(JUndefined):
"""Class used to represent any undefined jinja template variable."""

8
cloud-init.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 9 10:45:23 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
- Add patch from upstream to remove python2 compatibility so
cloud-init builds fine in Tumbleweed with a recent Jinja2
version. This patch is only applied in TW.
* 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
-------------------------------------------------------------------
Wed Jun 2 12:13:54 UTC 2021 - Robert Schweikert <rjschwei@suse.com>

5
cloud-init.spec
View File

@ -50,6 +50,8 @@ Patch72: cloud-init-log-file-mode.patch
Patch73: cloud-init-no-pwd-in-log.patch
# FIXME https://github.com/canonical/cloud-init/pull/857
Patch74: cloud-init-purge-cache-py-ver-change.patch
# PATCH-FIX-UPSTREAM https://github.com/canonical/cloud-init/commit/f23a4c4262ac11cd75c99fcbfbfe453f4e115f18
Patch75: 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
BuildRequires: fdupes
BuildRequires: filesystem
# pkg-config is needed to find correct systemd unit dir
@ -156,6 +158,9 @@ Documentation and examples for cloud-init tools
%patch72
%patch73
%patch74
%if 0%{?suse_version} >= 1550
%patch75 -p1
%endif
# patch in the full version to version.py
version_pys=$(find . -name version.py -type f)
[ -n "$version_pys" ] ||