summaryrefslogtreecommitdiff
path: root/lib/ansible/plugins/__init__.py
diff options
context:
space:
mode:
authorjpic <jamespic@gmail.com>2016-04-05 11:58:35 +0200
committerjpic <jamespic@gmail.com>2016-04-05 14:41:49 +0200
commitda175d0a5722f3b54a9086b38325994f20307a3f (patch)
tree50b1259fe5d146c51b7991ab61341c357c1f41cc /lib/ansible/plugins/__init__.py
parentcca084c89d4e0390fdad8a44d1d21c7201bb1f37 (diff)
downloadansible-da175d0a5722f3b54a9086b38325994f20307a3f.tar.gz
Bugfix: proper plugin configuration was reset
Before this patch, if config was ['/some/path'] then it would enter the else block and config would be set to []. The regression this patch fixes was introduced by 700db154.
Diffstat (limited to 'lib/ansible/plugins/__init__.py')
-rw-r--r--lib/ansible/plugins/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/plugins/__init__.py b/lib/ansible/plugins/__init__.py
index c10d19cd38..03558df986 100644
--- a/lib/ansible/plugins/__init__.py
+++ b/lib/ansible/plugins/__init__.py
@@ -66,7 +66,7 @@ class PluginLoader:
if config and not isinstance(config, list):
config = [config]
- else:
+ elif not config:
config = []
self.config = config