gentoo resync : 06.12.2017

2 files changed, 0 insertions, 75 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 219132167776..5720bd422ba9 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,3 @@
-AUX ansible-2.3.2.0-fix_key_error.patch 2733 BLAKE2B 0ce0c7f6bdd8f42f3796847d16037d667c53c0cc1855d1f0d6101e44425bc4edbf724153ec5e3744621aed18d042b0bce075496dd552ecff3037f1e7738a36ad SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e
 DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
diff --git a/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch b/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch
deleted file mode 100644
index 80b9350d3e37..000000000000
--- a/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From fbe9ec58c7f48d2cef4a49ba96e84bce5933d654 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Wed, 9 Aug 2017 12:01:31 -0500
-Subject: [PATCH] template: fix KeyError: 'undefined variable: 0
-
-Fixes: https://github.com/ansible/ansible/issues/20494
-
-Based on a patch by Zac Medico at:
-https://github.com/zmedico/ansible/pull/1/commits/32e5613a95e525c3a25b8cd5aa1beaa75a4b0d5c
----
- lib/ansible/template/template.py | 10 ++++++++--
- lib/ansible/template/vars.py     | 14 +++++++++++++-
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/lib/ansible/template/template.py b/lib/ansible/template/template.py
-index 55936f4..fe11471 100644
---- a/lib/ansible/template/template.py
-+++ b/lib/ansible/template/template.py
-@@ -33,5 +33,11 @@ class AnsibleJ2Template(jinja2.environment.Template):
-     '''
- 
-     def new_context(self, vars=None, shared=False, locals=None):
--        return self.environment.context_class(self.environment, vars.add_locals(locals), self.name, self.blocks)
--
-+        if vars is not None:
-+            if isinstance(vars, dict):
-+                vars = vars.copy()
-+                if locals is not None:
-+                    vars.update(locals)
-+            else:
-+                vars = vars.add_locals(locals)
-+        return self.environment.context_class(self.environment, vars, self.name, self.blocks)
-diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py
-index fc6140c..2bf95ac 100644
---- a/lib/ansible/template/vars.py
-+++ b/lib/ansible/template/vars.py
-@@ -19,6 +19,8 @@
- from __future__ import (absolute_import, division, print_function)
- __metaclass__ = type
- 
-+from collections import Mapping
-+
- from ansible.compat.six import iteritems
- from jinja2.utils import missing
- from ansible.module_utils._text import to_native
-@@ -27,7 +29,7 @@ from ansible.module_utils._text import to_native
- __all__ = ['AnsibleJ2Vars']
- 
- 
--class AnsibleJ2Vars:
-+class AnsibleJ2Vars(Mapping):
-     '''
-     Helper class to template all variable content before jinja2 sees it. This is
-     done by hijacking the variable storage that jinja2 uses, and overriding __contains__
-@@ -68,6 +70,16 @@ class AnsibleJ2Vars:
-             return True
-         return False
- 
-+    def __iter__(self):
-+        keys = set()
-+        keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras)
-+        return iter(keys)
-+
-+    def __len__(self):
-+        keys = set()
-+        keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras)
-+        return len(keys)
-+
-     def __getitem__(self, varname):
-         if varname not in self._templar._available_variables:
-             if varname in self._locals:
--- 
-2.13.3
-