commit: 02bc26438996afb8f237a92b90be0b48a2151e4f Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Nov 8 06:17:45 2022 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Tue Nov 8 23:50:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bc2643
app-admin/salt: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28187 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> app-admin/salt/files/salt-3004.1-jinja-3.patch | 40 -------------------------- 1 file changed, 40 deletions(-) diff --git a/app-admin/salt/files/salt-3004.1-jinja-3.patch b/app-admin/salt/files/salt-3004.1-jinja-3.patch deleted file mode 100644 index 98f21bc35129..000000000000 --- a/app-admin/salt/files/salt-3004.1-jinja-3.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py -index 0cb70bf64a..322c2f7f46 100644 ---- a/salt/utils/jinja.py -+++ b/salt/utils/jinja.py -@@ -25,10 +25,11 @@ import salt.utils.json - import salt.utils.stringutils - import salt.utils.url - import salt.utils.yaml --from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes -+from jinja2 import BaseLoader, TemplateNotFound, nodes - from jinja2.environment import TemplateModule - from jinja2.exceptions import TemplateRuntimeError - from jinja2.ext import Extension -+from markupsafe import Markup - from salt.exceptions import TemplateError - from salt.utils.decorators.jinja import jinja_filter, jinja_global, jinja_test - from salt.utils.odict import OrderedDict -@@ -706,7 +707,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs): - return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs) - - --@jinja2.contextfunction -+@jinja2.pass_context - def show_full_context(ctx): - return salt.utils.data.simple_types_filter( - {key: value for key, value in ctx.items()} -diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py -index 6502831aff..dec847364a 100644 ---- a/tests/unit/utils/test_jinja.py -+++ b/tests/unit/utils/test_jinja.py -@@ -22,7 +22,8 @@ import salt.utils.files - import salt.utils.json - import salt.utils.stringutils - import salt.utils.yaml --from jinja2 import DictLoader, Environment, Markup, exceptions -+from jinja2 import DictLoader, Environment, exceptions -+from markupsafe import Markup - from salt.exceptions import SaltRenderError - from salt.utils.decorators.jinja import JinjaFilter - from salt.utils.jinja import (
