[duplicity/f22: 1/2] Patch out deprecation warning.

Jon Ciesla limb at fedoraproject.org
Mon Mar 2 13:52:43 UTC 2015


commit f440bd0a506dc7b54d60e58ff03e596038b9ba31
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Mar 2 07:48:22 2015 -0600

    Patch out deprecation warning.

 duplicity-0.6.25-deprecation.patch | 19 +++++++++++++++++++
 duplicity.spec                     |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/duplicity-0.6.25-deprecation.patch b/duplicity-0.6.25-deprecation.patch
new file mode 100644
index 0000000..4d26652
--- /dev/null
+++ b/duplicity-0.6.25-deprecation.patch
@@ -0,0 +1,19 @@
+--- bin/duplicity~	2014-10-20 14:09:10.000000000 -0500
++++ bin/duplicity	2015-03-02 07:41:17.251248519 -0600
+@@ -1326,11 +1326,11 @@
+     dup_time.setcurtime()
+ 
+     # deprecation warning
+-    log.Warn(_(
+-"""
+-Duplicity 0.6 series is being deprecated:
+-See http://www.nongnu.org/duplicity/
+-"""), log.WarningCode.deprecate_0_6)
++#    log.Warn(_(
++#"""
++#Duplicity 0.6 series is being deprecated:
++#See http://www.nongnu.org/duplicity/
++#"""), log.WarningCode.deprecate_0_6)
+ 
+     # determine what action we're performing and process command line
+     action = commandline.ProcessCommandLine(sys.argv[1:])
diff --git a/duplicity.spec b/duplicity.spec
index 2d78b7e..1963e5d 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -3,11 +3,12 @@
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
 Version:        0.6.25
-Release:        1%{?dist}
+Release:        2%{?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.25-deprecation.patch
 Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
 Requires:       openssh-clients, ncftp >= 3.1.9, rsync, python-boto >= 0.9d
 Requires:       python-paramiko python-dropbox python-lockfile
@@ -35,6 +36,8 @@ but not hard links.
 %prep
 %setup -q
 
+%patch0 -p0
+
 %build
 %{__python} setup.py build
 
@@ -71,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/%{name}/cacert.pem
 
 %changelog
+* Mon Mar 02 2015 Jon Ciesla <limburgher at gmail.com> - 0.6.25-2
+- Patch out deprecation warning to fix deja-dup, BZ 1197627.
+
 * Thu Feb 26 2015 Jon Ciesla <limburgher at gmail.com> - 0.6.25-1
 - 0.6.25.
 


More information about the scm-commits mailing list