Issue-9704 Better handling of missing python

When they python interpreter is set incorrectly for the machine the file
is being checked for (e.g. for the local or the remote), the error
manifests as a readability or directory missing error which can be very
misleading.
pull/4420/head
James Keener 2014-12-03 16:28:55 -05:00
parent 1ec8b6e3c5
commit 4dfd86d847
3 changed files with 8 additions and 1 deletions

View File

@ -192,6 +192,10 @@ class ActionModule(object):
dest_file = conn.shell.join_path(dest, source_rel) dest_file = conn.shell.join_path(dest, source_rel)
remote_checksum = self.runner._remote_checksum(conn, tmp_path, dest_file, inject) remote_checksum = self.runner._remote_checksum(conn, tmp_path, dest_file, inject)
if remote_checksum == '4':
result = dict(msg="python isn't present on the system. Unable to compute checksum", failed=True)
return ReturnData(conn=conn, result=result)
if remote_checksum != '1' and not force: if remote_checksum != '1' and not force:
# remote_file does not exist so continue to next iteration. # remote_file does not exist so continue to next iteration.
continue continue

View File

@ -129,7 +129,7 @@ class ActionModule(object):
elif remote_checksum == '3': elif remote_checksum == '3':
result = dict(msg="remote file is a directory, fetch cannot work on directories", file=source, changed=False) result = dict(msg="remote file is a directory, fetch cannot work on directories", file=source, changed=False)
elif remote_checksum == '4': elif remote_checksum == '4':
result = dict(msg="python isn't present on the remote system. Unable to fetch file", file=source, changed=False) result = dict(msg="python isn't present on the system. Unable to compute checksum", file=source, changed=False)
return ReturnData(conn=conn, result=result) return ReturnData(conn=conn, result=result)
# calculate checksum for the local file # calculate checksum for the local file

View File

@ -83,6 +83,9 @@ class ActionModule(object):
source = utils.path_dwim(self.runner.basedir, source) source = utils.path_dwim(self.runner.basedir, source)
remote_checksum = self.runner._remote_checksum(conn, tmp, dest, inject) remote_checksum = self.runner._remote_checksum(conn, tmp, dest, inject)
if remote_checksum == '4':
result = dict(failed=True, msg="python isn't present on the system. Unable to compute checksum")
return ReturnData(conn=conn, result=result)
if remote_checksum != '3': if remote_checksum != '3':
result = dict(failed=True, msg="dest '%s' must be an existing dir" % dest) result = dict(failed=True, msg="dest '%s' must be an existing dir" % dest)
return ReturnData(conn=conn, result=result) return ReturnData(conn=conn, result=result)