valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge error caught by tests

Browse Source
This commit is contained in:
rallytime 2016-06-09 16:08:19 -06:00
parent e55952f548
commit fd9a618e36
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/boto_s3_bucket.py
View File

@ -312,7 +312,7 @@ def _compare_acl(current, desired, region, key, keyid, profile):
rather than the input itself. rather than the input itself.
''' '''
ocid = _get_canonical_id(region, key, keyid, profile) ocid = _get_canonical_id(region, key, keyid, profile)
return __utils__['boto3.json_objs_equal'](_prep_acl_for_compare(current), _acl_to_grant(desired, ocid)) return __utils__['boto3.json_objs_equal'](current, _acl_to_grant(desired, ocid))
def _compare_policy(current, desired, region, key, keyid, profile): def _compare_policy(current, desired, region, key, keyid, profile):