cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

switched to argv[0] from __file__ as it is what we actually wanted

Browse source
This commit is contained in:
Brian Coca 2015-06-09 17:29:46 -04:00
parent 5aec5e5eb0
commit fdeca37257
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible
View file

@ -44,7 +44,7 @@ if __name__ == '__main__':
cli = None cli = None
display = Display() display = Display()
me = os.path.basename(__file__) me = os.path.basename(sys.argv[0])
try: try:
if me == 'ansible-playbook': if me == 'ansible-playbook':

4
lib/ansible/cli/pull.py
View file

@ -131,7 +131,7 @@ class PullCLI(CLI):
if path is None: if path is None:
raise AnsibleOptionsError(("module '%s' not found.\n" % self.options.module_name)) raise AnsibleOptionsError(("module '%s' not found.\n" % self.options.module_name))
bin_path = os.path.dirname(os.path.abspath(__file__)) bin_path = os.path.dirname(os.path.abspath(sys.argv[0]))
cmd = '%s/ansible localhost -i "%s" %s -m %s -a "%s"' % ( cmd = '%s/ansible localhost -i "%s" %s -m %s -a "%s"' % (
bin_path, inv_opts, base_opts, self.options.module_name, repo_opts bin_path, inv_opts, base_opts, self.options.module_name, repo_opts
) )
@ -144,6 +144,8 @@ class PullCLI(CLI):
self.display.display("Sleeping for %d seconds..." % self.options.sleep) self.display.display("Sleeping for %d seconds..." % self.options.sleep)
time.sleep(self.options.sleep); time.sleep(self.options.sleep);
import q
q(cmd)
# RUN the Checkout command # RUN the Checkout command
rc, out, err = run_cmd(cmd, live=True) rc, out, err = run_cmd(cmd, live=True)