From ecd8b5d0640a9301a6609fca2d92322d024d7474 Mon Sep 17 00:00:00 2001 From: Mike Grozak Date: Fri, 7 Feb 2014 14:13:41 +0100 Subject: [PATCH] Found a way how to have symlinks towards files without absolute paths in prefixes; fixed incorrect force setting on the hard links, which can not point to non-existing files --- files/file | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/files/file b/files/file index 4b59b652c7d..7f789242df2 100644 --- a/files/file +++ b/files/file @@ -149,7 +149,6 @@ def main(): original_basename = dict(required=False), # Internal use only, for recursive ops recurse = dict(default='no', type='bool'), force = dict(required=False,default=False,type='bool'), - chdir = dict(required=False,default=False), diff_peek = dict(default=None), validate = dict(required=False, default=None), ), @@ -161,15 +160,8 @@ def main(): state = params['state'] force = params['force'] - params['chdir'] = chdir = os.path.expanduser(params['chdir']) params['path'] = path = os.path.expanduser(params['path']) - if state == 'link' and chdir is not None and os.isdir(chdir): - os.chdir(chdir) - # catch exception permission deny, no directory, etc - # save current working directory, chdir to it at the end of the module - # or before any escape - # short-circuit for diff_peek if params.get('diff_peek', None) is not None: appears_binary = False @@ -298,7 +290,7 @@ def main(): else: module.fail_json(msg="absolute paths are required") - if not os.path.exists(abs_src) and not force: + if not os.path.exists(abs_src): module.fail_json(path=path, src=src, msg='src file does not exist') if prev_state == 'absent':