internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional fixes for the new omit parameter variable

Browse Source
This commit is contained in:
James Cammarata
2014-08-05 12:20:10 -05:00
parent 6260635c65
commit e99db078b4
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/utils/__init__.py
View File

@@ -112,10 +112,6 @@ except ImportError:
pass
OMIT_PLACE_HOLDER = (
'__omit_place_holder__%s' % _md5(os.urandom(64)).hexdigest()
)
###############################################################
# Abstractions around keyczar
###############################################################
@@ -787,10 +783,6 @@ def _validate_both_dicts(a, b):
"failed to combine variables, expected dicts but got a '%s' and a '%s'" % (type(a).__name__, type(b).__name__)
)
def serialize_args(args):
''' convert a dict to a string of key/value items '''
return ' '.join("%s='%s'" % item for item in args.iteritems())
def merge_hash(a, b):
''' recursively merges hash b into a
keys from b take precedence over keys from a '''