commit: 92cdd36f1a90b7a0838312d51433e77096897542
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 20:48:49 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 23:37:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cdd36f
app-backup/borgmatic: add 1.5.17, drop 1.5.16
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 2 +-
...matic-1.5.16.ebuild => borgmatic-1.5.17.ebuild} | 1 -
.../files/borgmatic-1.5.16-tests_no_vim_dep.patch | 34 ----------------------
3 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 2d98e4ae0f7..012fef7a53a 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1,2 @@
DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B
c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9
SHA512
5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
-DIST borgmatic-1.5.16.tar.gz 276802 BLAKE2B
14eb511202b30b570cdf1097a68f732af09a6412e72dddaad0d01982f3375e1f0acf77546222b0166066d27ed6ac450db4e9cc9347eb7af972aa1df023ef0168
SHA512
c28a5e272309370620cc53275f44b5bbe8b0f43180c3bd3333009217a71e35b6ae02d88d9da95629c5a6b7457aec13059024da9e594ed2fbac65d0a41dd24444
+DIST borgmatic-1.5.17.tar.gz 276954 BLAKE2B
45d0458377d4825b84b5a535a28e15c3204479cd0faa349ac16cf59262bc1ad00ebf83c6309d85d4e9e168a1b1173e887c8d1185d509b5dc16d3d6026d0f0dec
SHA512
740c8f5de9cbb4980295e435f40d0bd239341f22849081d5616e151d8545118f64f5369dce4203d200910a23d5074b765b1a8cf8e9b515967143ba42bd489fc3
diff --git a/app-backup/borgmatic/borgmatic-1.5.16.ebuild
b/app-backup/borgmatic/borgmatic-1.5.17.ebuild
similarity index 96%
rename from app-backup/borgmatic/borgmatic-1.5.16.ebuild
rename to app-backup/borgmatic/borgmatic-1.5.17.ebuild
index faca0182b6c..a9f759659cf 100644
--- a/app-backup/borgmatic/borgmatic-1.5.16.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.17.ebuild
@@ -36,7 +36,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
"${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
- "${FILESDIR}"/${PN}-1.5.16-tests_no_vim_dep.patch # already merged
upstream
)
distutils_enable_tests pytest
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
deleted file mode 100644
index 492743e36e0..00000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e8b8d86592565acde1ac6e7809947b8a761f2f91 Mon Sep 17 00:00:00 2001
-From: Marek Szuba <[email protected]>
-Date: Tue, 27 Jul 2021 13:46:51 +0100
-Subject: [PATCH] tests/integration/test_execute: use plain Python rather than
- xxd
-
-Removes this test's dependencies on vim and /dev/urandom.
-
-Signed-off-by: Marek Szuba <[email protected]>
----
- tests/integration/test_execute.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/integration/test_execute.py
b/tests/integration/test_execute.py
-index 6dc6467..3b9bef9 100644
---- a/tests/integration/test_execute.py
-+++ b/tests/integration/test_execute.py
-@@ -1,5 +1,6 @@
- import logging
- import subprocess
-+import sys
-
- import pytest
- from flexmock import flexmock
-@@ -134,7 +135,8 @@ def
test_log_outputs_vents_other_processes_when_one_exits():
- flexmock(module).should_receive('command_for_process').and_return('grep')
-
- process = subprocess.Popen(
-- ['xxd', '-l', '40000', '-p', '/dev/urandom'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE
-+ [sys.executable, '-c', "import random, string;
print(''.join(random.choice(string.ascii_letters) for _ in range(40000)))"],
-+ stdout=subprocess.PIPE, stderr=subprocess.PIPE
- )
- other_process = subprocess.Popen(
- ['true'], stdin=process.stdout, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT
