Matthieu Herrb <matth...@herrb.eu> writes:
> Hi,
>
> Duplicity 0.6.25 introduced a warning about 0.6 series beeing phased
> out.
>
> This warning breaks the parsing of duplicity --version done by
> deja-dup and makes it bail that only version 0.6.0 is installed while
> it needs at least 0.6.23.
Here's a diff against recent cvs HEAD.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 2 Jan 2015 20:11:18 -0000 1.32
+++ Makefile 3 Jan 2015 17:22:58 -0000
@@ -4,7 +4,7 @@ COMMENT = encrypted backup using rsync a
MODPY_EGG_VERSION = 0.6.25
DISTNAME = duplicity-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = sysutils
Index: patches/patch-bin_duplicity
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/patches/patch-bin_duplicity,v
retrieving revision 1.6
diff -u -p -r1.6 patch-bin_duplicity
--- patches/patch-bin_duplicity 14 Nov 2014 07:49:33 -0000 1.6
+++ patches/patch-bin_duplicity 3 Jan 2015 17:20:53 -0000
@@ -1,6 +1,10 @@
$OpenBSD: patch-bin_duplicity,v 1.6 2014/11/14 07:49:33 brad Exp $
---- bin/duplicity.orig Fri May 9 09:27:41 2014
-+++ bin/duplicity Sat Aug 9 00:18:15 2014
+
+- try to bump resource limits before printing warnings
+- remove warning for 0.6.x versions, breaks sysutils/deja-dup
+
+--- bin/duplicity.orig Mon Oct 20 21:09:10 2014
++++ bin/duplicity Sat Jan 3 18:20:47 2015
@@ -1223,9 +1223,12 @@ def check_resources(action):
log.ErrorCode.get_ulimit_failed)
maxopen = min([l for l in (soft, hard) if l > -1])
@@ -17,3 +21,17 @@ $OpenBSD: patch-bin_duplicity,v 1.6 2014
def log_startup_parms(verbosity=log.INFO):
"""
+@@ -1324,13 +1327,6 @@ See https://bugs.launchpad.net/duplicity/+bug/931175
+
+ # set the current time strings (make it available for command line
processing)
+ 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)
+
+ # determine what action we're performing and process command line
+ action = commandline.ProcessCommandLine(sys.argv[1:])
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
