Merge lp:~smoser/ubuntu/maverick/s3cmd/bug-602317 into lp:ubuntu/maverick/s3cmd

[Scott Moser]

This fixes bug 602317.

[Stefano Rivera (stefanor)]

I wish every patch were this well documented :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-20 01:53:35 +0000
+++ debian/changelog	2010-07-06 18:31:27 +0000
@@ -1,3 +1,9 @@
+s3cmd (0.9.9.91-1ubuntu1) maverick; urgency=low
+
+  * fix setacl --acl-public when public (LP: #602317)
+
+ -- Scott Moser <[e-mail]>  Tue, 06 Jul 2010 11:48:45 -0400
+
 s3cmd (0.9.9.91-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2009-10-20 01:53:35 +0000
+++ debian/control	2010-07-06 18:31:27 +0000
@@ -1,7 +1,8 @@
 Source: s3cmd
 Section: utils
 Priority: optional
-Maintainer: Mikhail Gusarov <[e-mail]>
+XSBC-Original-Mainteiner: Mikhail Gusarov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 Uploaders: Python Applications Packaging Team <[e-mail]>
 Build-Depends: debhelper (>= 7), quilt (>= 0.40), python
 Build-Depends-Indep: python-support (>= 0.6.4)
 
=== added file 'debian/patches/fix-setacl-public.patch'
--- debian/patches/fix-setacl-public.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-setacl-public.patch	2010-07-06 18:31:27 +0000
@@ -0,0 +1,27 @@
+Description: setacl --add-public does nothing if any grantee has READ
+ The 'isAnonRead' in method if the Grantee class S3/ACL.py is broken.
+ Instead of checking if 'self' "isAllUsers" , it checks if the
+ 'isAllUsers' method is defined in self.
+ .
+ Thus, if you have any explicit grant that has 'READ', then 's3cmd
+ setacl --acl-public s3://mybucket/myfile.txt' will decide that the file
+ is already public and do nothing.
+ .
+ The fix is simple, and was also found during the adding of the feature
+ request for issue 28833177 [1] (see [2] to view that patch).
+Author: Scott Moser <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/602317
+Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3025892&group_id=178907&atid=887015
+Last-Update: 2010-07-06
+=== modified file 'S3/ACL.py'
+--- a/S3/ACL.py
++++ b/S3/ACL.py
+@@ -31,7 +31,7 @@
+ 		return self.tag == "URI" and self.name == Grantee.ALL_USERS_URI
+ 	
+ 	def isAnonRead(self):
+-		return self.isAllUsers and self.permission == "READ"
++		return self.isAllUsers() and self.permission == "READ"
+ 	
+ 	def getElement(self):
+ 		el = ET.Element("Grant")
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2007-08-24 23:17:27 +0000
+++ debian/patches/series	2010-07-06 18:31:27 +0000
@@ -1,1 +1,2 @@
 do-not-check-elementtree-at-build-time.patch
+fix-setacl-public.patch