[duplicity] - Upgrade to 0.6.10 - Added a patch to avoid ternary conditional operators (#639863)

[Robert Scheck]

commit 57f2fa15c3c54b81d611e0dbbd3dfaffecd8f17e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:03:23 2010 +0100

    - Upgrade to 0.6.10
    - Added a patch to avoid ternary conditional operators (#639863)

 duplicity-0.6.10-python23.patch |   24 ++++++++++++++++++++++++
 duplicity.spec                  |   12 +++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/duplicity-0.6.10-python23.patch b/duplicity-0.6.10-python23.patch
new file mode 100644
index 0000000..e90b025
--- /dev/null
+++ b/duplicity-0.6.10-python23.patch
@@ -0,0 +1,24 @@
+Patch by Alex Samorukov <samm at os2.kiev.ua> for duplicity >= 0.6.10 which removes ternary conditional
+operator use (introduced in Python 2.5). See also: https://bugs.launchpad.net/duplicity/+bug/629984
+
+--- duplicity-0.6.10/src/backends/botobackend.py		2010-09-19 18:18:31.000000000 +0200
++++ duplicity-0.6.10/src/backends/botobackend.py.python23	2010-10-31 20:56:12.115606706 +0100
+@@ -187,11 +187,16 @@
+                 # sleep before retry (new connection to a **hopeful** new host, so no need to wait so long)
+                 time.sleep(10)
+                 
++            if globals.s3_use_rrs:
++                    storage_class='REDUCED_REDUNDANCY'
++            else:
++                    storage_class='STANDARD'
++
+             log.Info("Uploading %s/%s to %s Storage" % (self.straight_url, remote_filename, 
+-                                                        'REDUCED_REDUNDANCY' if globals.s3_use_rrs else 'STANDARD'))
++                                                        storage_class))
+             try:
+                 key.set_contents_from_filename(source_path.name, {'Content-Type': 'application/octet-stream', 
+-                                              'x-amz-storage-class': 'REDUCED_REDUNDANCY' if globals.s3_use_rrs else 'STANDARD'})
++                                              'x-amz-storage-class': storage_class})
+                 key.close()
+                 self.resetConnection()
+                 return
diff --git a/duplicity.spec b/duplicity.spec
index c87ff51..a95bbfa 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -2,12 +2,13 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.6.09
-Release:        2%{?dist}
+Version:        0.6.10
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+Patch0:         duplicity-0.6.10-python23.patch
 Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
 Requires:       openssh-clients, ncftp >= 3.1.9, rsync, python-boto >= 0.9d
 %if 0%{?rhel}%{?fedora} <= 4
@@ -31,6 +32,7 @@ but not hard links.
 
 %prep
 %setup -q
+%patch0 -p1 -b .python23
 
 %build
 %{__python} setup.py build
@@ -54,7 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
-* Wed Sep 29 2010 jkeating - 0.6.09-2
+* Sun Oct 31 2010 Robert Scheck <robert at fedoraproject.org> 0.6.10-1
+- Upgrade to 0.6.10
+- Added a patch to avoid ternary conditional operators (#639863)
+
+* Wed Sep 29 2010 Jesse Keating <jkeating at redhat.com> 0.6.09-2
 - Rebuilt for gcc bug 634757
 
 * Mon Sep 13 2010 Robert Scheck <robert at fedoraproject.org> 0.6.09-1