From f074f1c4c4cdd774892b2f4527729f944e3b0a65 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 26 Mar 2012 21:23:28 -0400 Subject: [PATCH] Fixes from pyflakes --- bin/ansible-playbook | 3 +-- lib/ansible/callbacks.py | 1 - lib/ansible/runner.py | 5 ++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 9e90c3e2f5e..234536b666f 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -25,7 +25,6 @@ from optparse import OptionParser import ansible.playbook import ansible.constants as C from ansible import errors -from ansible import utils from ansible import callbacks def main(args): @@ -82,7 +81,7 @@ def main(args): ) try: - results = pb.run() + pb.run() hosts = sorted(pb.stats.processed.keys()) print "\n\nPLAY RECAP **********************\n\n" for h in hosts: diff --git a/lib/ansible/callbacks.py b/lib/ansible/callbacks.py index dfa724473a5..e9a1b15781c 100755 --- a/lib/ansible/callbacks.py +++ b/lib/ansible/callbacks.py @@ -18,7 +18,6 @@ ####################################################### -import sys import utils ####################################################### diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index 87b332a89a1..517393506e7 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -165,7 +165,6 @@ class Runner(object): if not os.path.exists(host_list): raise errors.AnsibleFileNotFound("inventory file not found: %s" % host_list) - rc = None if not os.access(host_list, os.X_OK): return Runner.parse_hosts_from_regular_file(host_list) else: @@ -437,7 +436,7 @@ class Runner(object): if ok: return self._chain_file_module(conn, tmp, data, options, executed) else: - return results1 + return (host, ok, data) # ***************************************************** @@ -488,7 +487,7 @@ class Runner(object): if ok: return self._chain_file_module(conn, tmp, data, options, executed) else: - return results1 + return (host, ok, data) # *****************************************************