[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 48793afcb40695adbe639fb6b7c746fdb3564f66
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Apr 17 16:11:24 2013 -0700

    List possible ACLs for PutObject

diff --git a/euca2ools/commands/walrus/putobject.py b/euca2ools/commands/walrus/putobject.py
index 3afe81e..56894ac 100644
--- a/euca2ools/commands/walrus/putobject.py
+++ b/euca2ools/commands/walrus/putobject.py
@@ -53,7 +53,9 @@ class PutObject(WalrusRequest):
                 help='''treat the destination as the full bucket and key name
                 for the uploaded object instead of a bucket and prefix.  This
                 only works when uploading a single file.'''),
-            Arg('--acl', dest='x-amz-acl', route_to=None),  ## FIXME
+            Arg('--acl', choices=('private', 'public-read',
+                'public-read-write', 'authenticated-read', 'bucket-owner-read',
+                'bucket-owner-full-control', 'aws-exec-read'), route_to=None),
             Arg('--guess-mime-type', action='store_true', route_to=None,
                 help='''automatically select MIME types for the files being
                 uploaded'''),

-- 
managing cloud instances for Eucalyptus