On Fri, 2 Sep 2016 17:00:01 +0200, Giovanni Bechis <[email protected]>
wrote:
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python2
> ++#!/usr/local/bin/python2.7
Be careful, that's MODPY_ADJ_FILES's task ;)
> Index: patches/patch-testing_functional_test_restart_py
> ===================================================================
> RCS file: patches/patch-testing_functional_test_restart_py
> diff -N patches/patch-testing_functional_test_restart_py
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-testing_functional_test_restart_py 2 Sep
> 2016 14:57:40 -0000 @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- testing/functional/test_restart.py.orig Fri Sep 2
> 16:48:03 2016 ++++ testing/functional/test_restart.py Fri Sep
> 2 16:47:14 2016 +@@ -327,6 +327,8 @@ class
> RestartTestWithoutEncryption(RestartTest):
> + tarcmd = "tar"
> + elif platform.platform().startswith('Darwin'):
> + tarcmd = "gtar"
> ++ elif platform.platform().endswith('BSD'):
> ++ tarcmd = "gtar"
What does platform.platform() returns on your machine? Here it's
OpenBSD-6.0-amd64-64bit so it obviously doesn't match. I added instead
elif platform.platform().startswith('OpenBSD'):
tarcmd = "gtar"
and now the test is ok.
What I'd like to, is commit the diff as-is and then work with upstream
to solve the problem. OK ?
Attached the diff I'd like to commit.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 9 Aug 2016 11:16:53 -0000 1.38
+++ Makefile 2 Sep 2016 17:40:03 -0000
@@ -5,7 +5,7 @@
COMMENT = encrypted backup using rsync algorithm
-MODPY_EGG_VERSION = 0.7.09
+MODPY_EGG_VERSION = 0.7.10
DISTNAME = duplicity-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
@@ -33,13 +33,22 @@ RUN_DEPENDS += devel/py-pexpect \
gnupg-<2:security/gnupg \
sysutils/py-lockfile
-MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
+TEST_DEPENDS = archivers/gtar \
+ archivers/par2cmdline \
+ devel/py-mock \
+ devel/py-pexpect \
+ sysutils/py-lockfile
-MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir
+MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
-# Some regression tests are hanging
-# TEST_DEPENDS = devel/py-mock
-NO_TEST = Yes
+MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir \
+ testing/manual/backendtest \
+ testing/overrides/bin/hsi \
+ testing/overrides/bin/lftp \
+ testing/overrides/bin/ncftpget \
+ testing/overrides/bin/ncftpls \
+ testing/overrides/bin/ncftpput \
+ testing/overrides/bin/tahoe
post-extract:
chmod 644 ${WRKSRC}/bin/*.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 9 Aug 2016 11:16:53 -0000 1.21
+++ distinfo 2 Sep 2016 17:40:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.7.09.tar.gz) = Qx5wYLobAoYF+CruIgJUNQaZjDhscAjNnf6XXpEoqLM=
-SIZE (duplicity-0.7.09.tar.gz) = 1542198
+SHA256 (duplicity-0.7.10.tar.gz) = SF/vFVJtFjwGHgDsCN4hbPfWUuZ9Qd5dw77Z+0IhSEI=
+SIZE (duplicity-0.7.10.tar.gz) = 1543523
Index: patches/patch-testing_functional_test_restart_py
===================================================================
RCS file: patches/patch-testing_functional_test_restart_py
diff -N patches/patch-testing_functional_test_restart_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-testing_functional_test_restart_py 2 Sep 2016 17:40:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- testing/functional/test_restart.py.orig Fri Sep 2 19:13:12 2016
++++ testing/functional/test_restart.py Fri Sep 2 19:14:03 2016
+@@ -327,6 +327,8 @@ class RestartTestWithoutEncryption(RestartTest):
+ tarcmd = "tar"
+ elif platform.platform().startswith('Darwin'):
+ tarcmd = "gtar"
++ elif platform.platform().startswith('OpenBSD'):
++ tarcmd = "gtar"
+ else:
+ raise Exception("Platform %s not supported by tar/gtar." % platform.platform())
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 9 Aug 2016 11:16:53 -0000 1.17
+++ pkg/PLIST 2 Sep 2016 17:40:03 -0000
@@ -2,12 +2,12 @@
bin/duplicity
bin/rdiffdir
lib/python${MODPY_VERSION}/site-packages/duplicity/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.py
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/_librsync.so
