Merge pull request #220 from skvidal/devel

handle issues when the hostlist is inadvertently set executable
pull/221/head
Michael DeHaan 13 years ago
commit 90a8893418

@ -134,8 +134,12 @@ class Inventory(object):
cmd = [self.inventory_file, '--list'] cmd = [self.inventory_file, '--list']
cmd = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False) try:
out, err = cmd.communicate() cmd = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
out, err = cmd.communicate()
except Exception, e:
raise errors.AnsibleError("Failure executing %s to produce host list:\n %s" % (self.inventory_file, str(e)))
rc = cmd.returncode rc = cmd.returncode
if rc: if rc:
raise errors.AnsibleError("%s: %s" % self.inventory_file, err) raise errors.AnsibleError("%s: %s" % self.inventory_file, err)

Loading…
Cancel
Save