Merge pull request #143 from jhoekx/fix-ansible-async

/bin/ansible async fixes
pull/145/head
Michael DeHaan 13 years ago
commit aaecf70586

@ -147,6 +147,8 @@ class Cli(object):
clock = clock - options.poll_interval clock = clock - options.poll_interval
time.sleep(options.poll_interval) time.sleep(options.poll_interval)
poll_hosts = self.hosts_to_poll(poll_results) poll_hosts = self.hosts_to_poll(poll_results)
if len(poll_hosts)==0:
break
######################################################## ########################################################

@ -119,7 +119,7 @@ class Runner(object):
euid = pwd.getpwuid(os.geteuid())[0] euid = pwd.getpwuid(os.geteuid())[0]
if self.transport == 'local' and self.remote_user != euid: if self.transport == 'local' and self.remote_user != euid:
raise Exception("User mismatch: expected %s, but is %s" % (self.remote_user, euid)) raise Exception("User mismatch: expected %s, but is %s" % (self.remote_user, euid))
if type(self.module_args) != str and type(self.module_args) != dict: if type(self.module_args) not in [str, unicode, dict]:
raise Exception("module_args must be a string or dict: %s" % self.module_args) raise Exception("module_args must be a string or dict: %s" % self.module_args)
self._tmp_paths = {} self._tmp_paths = {}

Loading…
Cancel
Save