summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-08-05 10:06:50 -0500
committerJames Cammarata <jimi@sngx.net>2016-08-05 10:06:50 -0500
commit1714279b5e18cdc3f684e5ea3af5416b5f0c8c67 (patch)
tree1819ffb97a1a645d745545e32a45df860d9ac8ad
parent6db6edfc4f49cec9ab3bb93dc900cd5ceca0e8cb (diff)
downloadansible-1714279b5e18cdc3f684e5ea3af5416b5f0c8c67.tar.gz
Tweak the way the debug strategy imports the linear strategy parent
Due to the way we load plugins, internally to Python there can be issues when the debug strategy is loaded after the linear strategy. To work around this, we're changing the import line for the linear strategy to avoid the problem. Related to #16825
-rw-r--r--lib/ansible/plugins/strategy/debug.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/plugins/strategy/debug.py b/lib/ansible/plugins/strategy/debug.py
index eb9ba24633..3d7e26ca99 100644
--- a/lib/ansible/plugins/strategy/debug.py
+++ b/lib/ansible/plugins/strategy/debug.py
@@ -6,7 +6,7 @@ import cmd
import pprint
import sys
-from ansible.plugins.strategy import linear
+from ansible.plugins.strategy.linear import StrategyModule as LinearStrategyModule
try:
from __main__ import display
@@ -25,7 +25,7 @@ class NextAction(object):
self.result = result
-class StrategyModule(linear.StrategyModule):
+class StrategyModule(LinearStrategyModule):
def __init__(self, tqm):
self.curr_tqm = tqm
super(StrategyModule, self).__init__(tqm)