[euca2ools/el6: 3/3] Fix euare-useraddpolicy --delegate

[gholms]

commit b84a795987b8dc268465bdf2dd6cb07b78b1dc00
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Mar 4 16:14:33 2013 -0800

    Fix euare-useraddpolicy --delegate
    
    https://eucalyptus.atlassian.net/browse/TOOLS-274

 euca2ools-2.1.3-useraddpol-delegate.patch |   22 ++++++++++++++++++++++
 euca2ools.spec                            |    6 ++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/euca2ools-2.1.3-useraddpol-delegate.patch b/euca2ools-2.1.3-useraddpol-delegate.patch
new file mode 100644
index 0000000..846acc8
--- /dev/null
+++ b/euca2ools-2.1.3-useraddpol-delegate.patch
@@ -0,0 +1,22 @@
+commit c3cdefb225be9b430eb0d73038f0a90d1ac5483a
+Author: Garrett Holmstrom <gholms at fedoraproject.org>
+Date:   Thu Feb 28 14:33:16 2013 -0800
+
+    Make usercreatepolicy pass DelegateAccount
+    
+    Fixes TOOLS-274
+
+diff --git a/euca2ools/commands/euare/adduserpolicy.py b/euca2ools/commands/euare/adduserpolicy.py
+index 18ebb58..aa253cf 100644
+--- a/euca2ools/commands/euare/adduserpolicy.py
++++ b/euca2ools/commands/euare/adduserpolicy.py
+@@ -120,7 +120,8 @@ class AddUserPolicy(AWSQueryRequest):
+         self.policy = self.build_policy()
+         obj = euca2ools.commands.euare.putuserpolicy.PutUserPolicy()
+         return obj.main(user_name=self.user_name, policy_name=self.policy_name,
+-                        policy_document=self.policy)
++                        policy_document=self.policy,
++                        delegate=self.args.get('delegate'))
+ 
+     def main_cli(self):
+         euca2ools.utils.print_version_if_necessary()
diff --git a/euca2ools.spec b/euca2ools.spec
index 59a7935..4353030 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -30,6 +30,10 @@ BuildRequires:  m2crypto
 
 BuildArch:      noarch
 
+# https://eucalyptus.atlassian.net/browse/TOOLS-274
+Patch1:         euca2ools-2.1.3-useraddpol-delegate.patch
+
+
 %description
 Euca2ools are command line tools used to interact with Eucalyptus,
 a service overlay designed to be interface-compatible with Amazon Web
@@ -38,6 +42,7 @@ Services (AWS), as well as AWS itself.
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
@@ -77,6 +82,7 @@ rm -rf %{buildroot}
 %changelog
 * Mon Mar  4 2013 Garrett Holmstrom <gholms at fedoraproject.org> - 2.1.3-1
 - Upstream update (2.1.3) [RH:916716]
+- Fix euare-useraddpolicy --delegate
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild