Merge pull request #10137 from nmeum/devel

Saner ansible-pull output
This commit is contained in:
Brian Coca 2015-01-30 10:18:35 -05:00
commit dfe629a872

View file

@ -151,7 +151,7 @@ def main(args):
return 1 return 1
now = datetime.datetime.now() now = datetime.datetime.now()
print >>sys.stderr, now.strftime("Starting ansible-pull at %F %T") print now.strftime("Starting ansible-pull at %F %T")
# Attempt to use the inventory passed in as an argument # Attempt to use the inventory passed in as an argument
# It might not yet have been downloaded so use localhost if note # It might not yet have been downloaded so use localhost if note
@ -194,7 +194,7 @@ def main(args):
if rc != 0: if rc != 0:
if options.force: if options.force:
print "Unable to update repository. Continuing with (forced) run of playbook." print >>sys.stderr, "Unable to update repository. Continuing with (forced) run of playbook."
else: else:
return rc return rc
elif options.ifchanged and '"changed": true' not in out: elif options.ifchanged and '"changed": true' not in out: