rpms/duplicity/F-9 duplicity-0.4.11-python23.patch, 1.1, 1.2 duplicity.spec, 1.17, 1.18
Robert Scheck (robert)
fedora-extras-commits at redhat.com
Sat Jun 28 09:09:50 UTC 2008
Author: robert
Update of /cvs/extras/rpms/duplicity/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16588/F-9
Modified Files:
duplicity-0.4.11-python23.patch duplicity.spec
Log Message:
Added patch for incremental backups using python 2.3 (#453069)
duplicity-0.4.11-python23.patch:
Index: duplicity-0.4.11-python23.patch
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-9/duplicity-0.4.11-python23.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- duplicity-0.4.11-python23.patch 5 May 2008 20:00:59 -0000 1.1
+++ duplicity-0.4.11-python23.patch 28 Jun 2008 09:08:26 -0000 1.2
@@ -1,6 +1,10 @@
Patch by Robert Scheck <robert at fedoraproject.org> to get duplicity >= 0.4.11 building with
older Python 2.3 again. This release done by Kenneth Loafman <kenneth at loafman.com> luckily
-got Python 2.3 support back.
+got Python 2.3 support back. Second part of the patch replaces the use of functionality of
+Python >= 2.4 functions. For further information, see:
+
+ - http://lists.gnu.org/archive/html/duplicity-talk/2008-05/msg00036.html
+ - https://bugzilla.redhat.com/show_bug.cgi?id=453069
--- duplicity-0.4.11/setup.py 2008-05-05 16:40:53.000000000 +0200
+++ duplicity-0.4.11/setup.py.python23 2008-05-05 21:45:35.000000000 +0200
@@ -15,3 +19,28 @@
sys.exit(1)
try:
+--- duplicity-0.4.11/src/collections.py 2008-05-05 16:40:53.000000000 +0200
++++ duplicity-0.4.11/src/collections.py.python23 2008-06-28 10:53:35.000000000 +0200
+@@ -789,6 +789,10 @@
+ NOTE: n = 1 -> time of latest available chain (n = 0 is not
+ a valid input). Thus the second-to-last is obtained with n=2
+ rather than n=1."""
++
++ def mycmp(x, y):
++ return cmp(x.get_first().time, y.get_first().time)
++
+ assert self.values_set
+ assert n > 0
+
+@@ -796,9 +800,9 @@
+ return None
+
+ sorted = self.all_backup_chains[:]
+- sorted.sort(reverse = True,
+- key = lambda chain: chain.get_first().time)
++ sorted.sort(mycmp)
+
++ sorted.reverse()
+ return sorted[n - 1]
+
+ def get_older_than(self, t):
Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-9/duplicity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- duplicity.spec 5 May 2008 20:00:59 -0000 1.17
+++ duplicity.spec 28 Jun 2008 09:08:26 -0000 1.18
@@ -3,7 +3,7 @@
Summary: Encrypted bandwidth-efficient backup using rsync algorithm
Name: duplicity
Version: 0.4.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+
Group: Applications/Archiving
URL: http://www.nongnu.org/duplicity/
@@ -51,6 +51,9 @@
%{python_sitearch}/%{name}*
%changelog
+* Sat Jun 28 2008 Robert Scheck <robert at fedoraproject.org> 0.4.11-2
+- Added patch for incremental backups using python 2.3 (#453069)
+
* Mon May 05 2008 Robert Scheck <robert at fedoraproject.org> 0.4.11-1
- Upgrade to 0.4.11 (#440346)
More information about the scm-commits
mailing list