From 27978ed9c1b754dcec4dc5ca7d1defd4aaa45e09 Mon Sep 17 00:00:00 2001
From: Daniel Hokka Zakrisson <daniel@hozac.com>
Date: Thu, 14 Mar 2013 11:22:46 +0100
Subject: [PATCH] Don't override argument specs with FILE_COMMON_ARGUMENTS

Doing so will remove aliases, types, etc, leading to #2388 and other
issues.
---
 lib/ansible/module_common.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/module_common.py b/lib/ansible/module_common.py
index 59b2f61fd1..f656fc0fb6 100644
--- a/lib/ansible/module_common.py
+++ b/lib/ansible/module_common.py
@@ -176,7 +176,9 @@ class AnsibleModule(object):
         self.aliases = {}
         
         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
         (self.params, self.args) = self._load_params()