Date: Wednesday, December 21, 2016 @ 21:05:00 Author: lfleischer Revision: 200858
upgpkg: borg 1.0.9-1 Upstream update. Modified: borg/trunk/PKGBUILD Deleted: borg/trunk/borg-1.0.8-fix-testsuite.patch --------------------------------+ PKGBUILD | 11 +--------- borg-1.0.8-fix-testsuite.patch | 40 --------------------------------------- 2 files changed, 2 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-21 20:56:07 UTC (rev 200857) +++ PKGBUILD 2016-12-21 21:05:00 UTC (rev 200858) @@ -3,7 +3,7 @@ pkgname=borg _pkgname=borgbackup -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc='Deduplicating backup program with compression and authenticated encryption' url='https://borgbackup.github.io/' @@ -17,17 +17,10 @@ provides=('borgbackup') replaces=('borgbackup') source=("https://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"; - borg-1.0.8-fix-testsuite.patch borg.coveragerc) -sha256sums=('6902563c447c4f378ff1a13167f83d15eb60a02316a06368a539b7ff3d88aeb9' - '6e283d6a166c4823ea5af5b68cfc46c38e55124434a4f9f552bfb7f963b1401a' +sha256sums=('35860840e0429d4bb3acc8b9dd33aa5996a42fb2b678813a982b321a7dba3cb2' '183814ae70fce7bbcf04dbbf3866eaf76867896a4327f8a3b553e095d1ff360f') -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - patch -p1 -i ../borg-1.0.8-fix-testsuite.patch -} - build() { cd "$srcdir/$_pkgname-$pkgver" python setup.py build Deleted: borg-1.0.8-fix-testsuite.patch =================================================================== --- borg-1.0.8-fix-testsuite.patch 2016-12-21 20:56:07 UTC (rev 200857) +++ borg-1.0.8-fix-testsuite.patch 2016-12-21 21:05:00 UTC (rev 200858) @@ -1,40 +0,0 @@ -From 960c42193acdab214217dd8a472f7f28d7ca5153 Mon Sep 17 00:00:00 2001 -From: Marian Beermann <[email protected]> -Date: Sun, 13 Nov 2016 11:19:58 +0100 -Subject: [PATCH] fix tox build for environment-python != containing-python in - yet-another instance - -this instance: the repository worktree is *not* named borg. - -Cherry pick of 4f1157c into 1.0-maint due to f3efcdb - -TODO removed since we already did that after 1.0-maint, but 1.0-maint -will never receive the change. ---- - conftest.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/conftest.py b/conftest.py -index d80aed4..d542366 100644 ---- a/conftest.py -+++ b/conftest.py -@@ -1,4 +1,5 @@ - import os -+import os.path - import sys - - import pytest -@@ -10,12 +11,10 @@ - # The workaround is to remove entries pointing there from the path and check whether "borg" - # is still importable. If it is not, then it has not been installed in the environment - # and the entries are put back. --# --# TODO: After moving the package to src/: remove this. - - original_path = list(sys.path) - for entry in original_path: -- if entry == '' or entry.endswith('/borg'): -+ if entry == '' or entry == os.path.dirname(__file__): - sys.path.remove(entry) - - try:
