cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2395 from dhozac/arg-override-common

Browse source 
Don't override argument specs with FILE_COMMON_ARGUMENTS
This commit is contained in:
Michael DeHaan 2013-03-14 08:23:51 -07:00
commit c260690f7a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_common.py
View file

@ -176,7 +176,9 @@ class AnsibleModule(object):
self.aliases = {} self.aliases = {}
if add_file_common_args: if add_file_common_args:
self.argument_spec.update(FILE_COMMON_ARGUMENTS) for k, v in FILE_COMMON_ARGUMENTS.iteritems():
if k not in self.argument_spec:
self.argument_spec[k] = v
os.environ['LANG'] = MODULE_LANG os.environ['LANG'] = MODULE_LANG
(self.params, self.args) = self._load_params() (self.params, self.args) = self._load_params()

4
library/copy
View file

@ -105,8 +105,8 @@ def main():
md5sum_dest = None md5sum_dest = None
if os.path.exists(dest): if os.path.exists(dest):
# if not force: if not force:
# module.exit_json(msg="file already exists and force is set (%s)" % force, src=src, dest=dest, changed=False) module.exit_json(msg="file already exists", src=src, dest=dest, changed=False)
if (os.path.isdir(dest)): if (os.path.isdir(dest)):
basename = os.path.basename(src) basename = os.path.basename(src)
dest = os.path.join(dest, basename) dest = os.path.join(dest, basename)