ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

removes python requirement to script

Browse source 
mistakenly added when checksum was made to use stat module
fixed assertion in test
This commit is contained in:
Brian Coca 2016-03-18 21:21:55 -07:00
parent 6768f34b31
commit 1ebc2fda71
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/plugins/action/script.py
View file

@ -26,6 +26,13 @@ from ansible.plugins.action import ActionBase
class ActionModule(ActionBase): class ActionModule(ActionBase):
TRANSFERS_FILES = True TRANSFERS_FILES = True
def _get_remote_raw_stat(self, path):
cmd = ['test', '-e', path]
result = self._low_level_execute_command(cmd=' '.join(cmd), sudoable=True)
if result['rc'] == 0:
return True
return False
def run(self, tmp=None, task_vars=None): def run(self, tmp=None, task_vars=None):
''' handler for file transfer operations ''' ''' handler for file transfer operations '''
if task_vars is None: if task_vars is None:
@ -47,9 +54,7 @@ class ActionModule(ActionBase):
# do not run the command if the line contains creates=filename # do not run the command if the line contains creates=filename
# and the filename already exists. This allows idempotence # and the filename already exists. This allows idempotence
# of command executions. # of command executions.
res = self._execute_module(module_name='stat', module_args=dict(path=creates), task_vars=task_vars, tmp=tmp, persist_files=True) if self._get_remote_raw_stat(creates):
stat = res.get('stat', None)
if stat and stat.get('exists', False):
return dict(skipped=True, msg=("skipped, since %s exists" % creates)) return dict(skipped=True, msg=("skipped, since %s exists" % creates))
removes = self._task.args.get('removes') removes = self._task.args.get('removes')
@ -57,9 +62,7 @@ class ActionModule(ActionBase):
# do not run the command if the line contains removes=filename # do not run the command if the line contains removes=filename
# and the filename does not exist. This allows idempotence # and the filename does not exist. This allows idempotence
# of command executions. # of command executions.
res = self._execute_module(module_name='stat', module_args=dict(path=removes), task_vars=task_vars, tmp=tmp, persist_files=True) if self._get_remote_raw_stat(removes):
stat = res.get('stat', None)
if stat and not stat.get('exists', False):
return dict(skipped=True, msg=("skipped, since %s does not exist" % removes)) return dict(skipped=True, msg=("skipped, since %s does not exist" % removes))
# the script name is the first item in the raw params, so we split it # the script name is the first item in the raw params, so we split it

2
test/integration/roles/test_script/tasks/main.yml
View file

@ -66,4 +66,4 @@
- name: assert that the file was removed by the script - name: assert that the file was removed by the script
assert: assert:
that: that:
- "script_result1.changed != True" - "script_result1|changed"