Roll version of gsutil to 4.15.

third_party/gsutil/gslib/commands/defacl.py

Index: third_party/gsutil/gslib/commands/defacl.py
diff --git a/third_party/gsutil/gslib/commands/defacl.py b/third_party/gsutil/gslib/commands/defacl.py
index 24c6e259e7dbcdd5dc31591f7e7bd2fe9abd2e4e..87648a85dbbc5e6a3272158f002ec3045a6c69a9 100644
--- a/third_party/gsutil/gslib/commands/defacl.py
+++ b/third_party/gsutil/gslib/commands/defacl.py
@@ -30,6 +30,7 @@ from gslib.exception import CommandException
 from gslib.help_provider import CreateHelpText
 from gslib.storage_url import StorageUrlFromString
 from gslib.third_party.storage_apitools import storage_v1_messages as apitools_messages
+from gslib.translation_helper import PRIVATE_DEFAULT_OBJ_ACL
 from gslib.util import NO_MAX
 from gslib.util import Retry
 from gslib.util import UrlsAreForSingleProvider
@@ -101,10 +102,15 @@ _CH_DESCRIPTION = """
 
     gsutil defacl ch -g admins@example.com:O gs://example-bucket
 
-  Grant the owners of project example-project-123 READ access to new objects
-  created in the bucket example-bucket:
+  Remove the group admins@example.com from the default object ACL on bucket
+  example-bucket:
 
-    gsutil acl ch -p owners-example-project-123:R gs://example-bucket
+    gsutil defacl ch -d admins@example.com gs://example-bucket
+
+  Add the owners of project example-project-123 to the default object ACL on
+  bucket example-bucket with READ access:
+
+    gsutil defacl ch -p owners-example-project-123:R gs://example-bucket
 
   NOTE: You can replace 'owners' with 'viewers' or 'editors' to grant access
   to a project's viewers/editors respectively.
@@ -268,6 +274,11 @@ class DefAclCommand(Command):
       self.logger.info('No changes to %s', url)
       return
 
+    if not current_acl:
+      # Use a sentinel value to indicate a private (no entries) default
+      # object ACL.
+      current_acl.append(PRIVATE_DEFAULT_OBJ_ACL)
+
     try:
       preconditions = Preconditions(meta_gen_match=bucket.metageneration)
       bucket_metadata = apitools_messages.Bucket(defaultObjectAcl=current_acl)