From fd9a618e36bc708d83c2543cfd28fc8f4e5408f2 Mon Sep 17 00:00:00 2001 From: rallytime Date: Thu, 9 Jun 2016 16:08:19 -0600 Subject: [PATCH] Fix merge error caught by tests --- salt/states/boto_s3_bucket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/states/boto_s3_bucket.py b/salt/states/boto_s3_bucket.py index d655e342db..8e416dd213 100644 --- a/salt/states/boto_s3_bucket.py +++ b/salt/states/boto_s3_bucket.py @@ -312,7 +312,7 @@ def _compare_acl(current, desired, region, key, keyid, profile): rather than the input itself. ''' 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):