From f956ff961982e4372363052c108f0c5d18f8de62 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Fri, 5 Aug 2016 10:06:50 -0500 Subject: [PATCH] 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 (cherry picked from commit 1714279b5e18cdc3f684e5ea3af5416b5f0c8c67) --- lib/ansible/plugins/strategy/debug.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/strategy/debug.py b/lib/ansible/plugins/strategy/debug.py index eb9ba24633e..3d7e26ca993 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)