From 54eae4a793031647d6bb4fe588cda86bccde9ba8 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Tue, 10 Nov 2015 17:57:43 +0200 Subject: [PATCH] Check sys.modules before loading modules Code for a plugin is usually loaded by a PluginLoader(), and henceforth available from self._module_cache, which prevents duplicate loading. However there are situations (e.g. where one action plugin imports code from another one) where the plugin module might be already imported (and resident in sys.modules), but not present in the PluginLoader's _module_cache, which causes imp.load_source() to effectively reload the module, overwriting global class declarations and causing subtle latent bugs. Fixes #13110. Fixes #12979. --- lib/ansible/plugins/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ansible/plugins/__init__.py b/lib/ansible/plugins/__init__.py index 4def393a170..91b7bc3fa1d 100644 --- a/lib/ansible/plugins/__init__.py +++ b/lib/ansible/plugins/__init__.py @@ -304,6 +304,9 @@ class PluginLoader: __contains__ = has_plugin def _load_module_source(self, name, path): + if name in sys.modules: + # See https://github.com/ansible/ansible/issues/13110 + return sys.modules[name] with open(path, 'r') as module_file: module = imp.load_source(name, path, module_file) return module