From cb40511807a03e922bd3fdd477fa41191bbfa62a Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Thu, 3 Nov 2016 21:05:30 +0000
Subject: [PATCH] s3: Allow command line to override acl (Thanks Radek Senfeld)

---
 s3/s3.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/s3/s3.go b/s3/s3.go
index 08da61f0e..94a1bad3b 100644
--- a/s3/s3.go
+++ b/s3/s3.go
@@ -368,12 +368,15 @@ func NewFs(name, root string) (fs.Fs, error) {
 		c:                  c,
 		bucket:             bucket,
 		ses:                ses,
-		acl:                fs.ConfigFile.MustValue(name, "acl", *s3ACL),
+		acl:                fs.ConfigFile.MustValue(name, "acl"),
 		root:               directory,
 		locationConstraint: fs.ConfigFile.MustValue(name, "location_constraint"),
 		sse:                fs.ConfigFile.MustValue(name, "server_side_encryption"),
 		storageClass:       fs.ConfigFile.MustValue(name, "storage_class"),
 	}
+	if *s3ACL != "" {
+		f.acl = *s3ACL
+	}
 	if *s3StorageClass != "" {
 		f.storageClass = *s3StorageClass
 	}