From 97d6807ec569640d8fc64803ca9989b6abfa80d0 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Fri, 15 Aug 2014 14:50:00 -0500 Subject: [PATCH] File module cannot create relative paths When trying to create a directory relative to the current working directory, a directory is created at the root of the filesystem instead. This patch ensures that directories specified with relative paths will be created in the current working directory. Fully qualified paths aren't affected Signed-off-by: Major Hayden --- files/file | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/files/file b/files/file index 6e663e52f05..85102cb9dc5 100644 --- a/files/file +++ b/files/file @@ -210,8 +210,15 @@ def main(): module.exit_json(changed=True) changed = True curpath = '' - for dirname in path.split('/'): + # Split the path so we can apply filesystem attributes recursively + # from the root (/) directory for absolute paths or the base path + # of a relative path. We can then walk the appropriate directory + # path to apply attributes. + for dirname in path.strip('/').split('/'): curpath = '/'.join([curpath, dirname]) + # Remove leading slash if we're creating a relative path + if not os.path.isabs(path): + curpath = curpath.lstrip('/') if not os.path.exists(curpath): os.mkdir(curpath) tmp_file_args = file_args.copy()