* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/files/, app-backup/borgmatic/
@ 2020-03-29 21:45 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2020-03-29 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 4961db15c6560f10fa685ccd9e19d83b3ed883c1
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 20:46:53 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 21:39:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4961db15
app-backup/borgmatic: install systemd units
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild | 65 ++++++++++++++++++++++
.../borgmatic-1.5.1-systemd_service_bin_path.patch | 8 +++
2 files changed, 73 insertions(+)
diff --git a/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild b/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild
new file mode 100644
index 00000000000..d5b11aab9bb
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="${PYTHON_DEPS}
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/ruamel-yaml-0.17.0"[${PYTHON_USEDEP}]
+RDEPEND="${DEPEND}
+ app-backup/borgbackup"
+BDEPEND="test? (
+ ${DEPEND}
+ dev-python/flexmock[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
+ "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # Unlike the other two test files in integration/commands, which use the
+ # relevant modules' respective APIs, test_borgmatic.py tries to call the
+ # 'borgmatic' executable - which has not even been created by now.
+ # Seeing as the only test run from this file as of 2020-03-25 is the
+ # parsing of contents of 'borgmatic --version', just skip it for now.
+ rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+ distutils-r1_src_install
+ systemd_dounit sample/systemd/borgmatic.{service,timer}
+ keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To generate a sample configuration file, run:"
+ elog " generate-borgmatic-config"
+ else
+ elog "To upgrade your configuration file to the current version, run:"
+ elog " upgrade-borgmatic-config"
+ fi
+ elog
+ elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
new file mode 100644
index 00000000000..90e94ac1f55
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
@@ -0,0 +1,8 @@
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -21,4 +21,4 @@
+
+ # Delay start to prevent backups running during boot.
+ ExecStartPre=sleep 1m
+-ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --syslog-verbosity 1
++ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --syslog-verbosity 1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/files/, app-backup/borgmatic/
@ 2021-07-27 11:36 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-07-27 11:36 UTC (permalink / raw
To: gentoo-commits
commit: b2558a7f3e48600636fd84a573a1f08c8eea7b04
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 11:30:56 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 11:36:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2558a7f
app-backup/borgmatic: add 1.5.16, drop 1.5.13
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 2 +-
...matic-1.5.13.ebuild => borgmatic-1.5.16.ebuild} | 26 ++++++++++------------
.../borgmatic-1.5.16-flexmock_write_args.patch | 19 ++++++++++++++++
...borgmatic-1.5.16-systemd_service_bin_path.patch | 8 +++++++
4 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index febf60c24c5..2d98e4ae0f7 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1,2 @@
-DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
+DIST borgmatic-1.5.16.tar.gz 276802 BLAKE2B 14eb511202b30b570cdf1097a68f732af09a6412e72dddaad0d01982f3375e1f0acf77546222b0166066d27ed6ac450db4e9cc9347eb7af972aa1df023ef0168 SHA512 c28a5e272309370620cc53275f44b5bbe8b0f43180c3bd3333009217a71e35b6ae02d88d9da95629c5a6b7457aec13059024da9e594ed2fbac65d0a41dd24444
diff --git a/app-backup/borgmatic/borgmatic-1.5.13.ebuild b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
similarity index 82%
rename from app-backup/borgmatic/borgmatic-1.5.13.ebuild
rename to app-backup/borgmatic/borgmatic-1.5.16.ebuild
index 5fd3f3e7264..a9f759659cf 100644
--- a/app-backup/borgmatic/borgmatic-1.5.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS="rdepend"
@@ -15,29 +15,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
+KEYWORDS="~amd64 ~riscv"
# borg is called as an external tool, hence no pythonic stuff
RDEPEND="app-backup/borgbackup
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
')"
-#BDEPEND="
-# test? (
-# $(python_gen_cond_dep '
-# dev-python/flexmock[${PYTHON_USEDEP}]
-# ')
-# )"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/flexmock[${PYTHON_USEDEP}]
+ ')
+ )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
"${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
)
distutils_enable_tests pytest
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
new file mode 100644
index 00000000000..32937adadba
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
@@ -0,0 +1,19 @@
+Apparently in the flexmock universe, sys.stdout.write() takes two
+arguments rather than one. As of late July 2021, upstream hasn't said
+a word of comment on this; see
+https://github.com/flexmock/flexmock/issues/37
+
+--- a/tests/unit/commands/test_borgmatic.py
++++ b/tests/unit/commands/test_borgmatic.py
+@@ -448,7 +448,10 @@
+ ['baz']
+ )
+ stdout = flexmock()
+- stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
++ try:
++ stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
++ except flexmock.MethodSignatureError:
++ stdout.should_receive('write').with_args('["foo", "bar", "baz"]', None).once()
+ flexmock(module.sys).stdout = stdout
+ arguments = {}
+
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch
new file mode 100644
index 00000000000..26298625fc1
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch
@@ -0,0 +1,8 @@
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -57,4 +57,4 @@
+ # Delay start to prevent backups running during boot. Note that systemd-inhibit requires dbus and
+ # dbus-user-session to be installed.
+ ExecStartPre=sleep 1m
+-ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -1 --syslog-verbosity 1
++ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -1 --syslog-verbosity 1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/files/, app-backup/borgmatic/
@ 2021-07-28 23:38 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-07-28 23:38 UTC (permalink / raw
To: gentoo-commits
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 <marek.szuba@cern.ch>
-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 <marek.szuba@cern.ch>
----
- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/files/, app-backup/borgmatic/
@ 2021-11-19 15:04 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-11-19 15:04 UTC (permalink / raw
To: gentoo-commits
commit: d1211c01c1daabfe54514fa398d79acc5c9df291
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 15:01:23 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 15:01:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1211c01
app-backup/borgmatic: drop 1.5.18
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-backup/borgmatic/Manifest | 1 -
app-backup/borgmatic/borgmatic-1.5.18.ebuild | 69 ----------------------
.../borgmatic-1.5.16-flexmock_write_args.patch | 19 ------
3 files changed, 89 deletions(-)
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 461f6c83eb55..1ed252683d44 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1 @@
-DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
DIST borgmatic-1.5.20.tar.gz 277495 BLAKE2B 6714b132549633b1d24e3c0bd7cd16ee9ff5510c4915d4115d62f4a260dc3cc505a02d8a14220184d53c934384d9ca092a38d6deebcefb843e7ba4492043819a SHA512 ea370ea1e57f56c8c4b7636695ae40473b9d58696948f55afde55b31b3bcbd68923952e80b0ef0bc40f68bb265ccd47bd5e0b2735ee9b4b6f3418a5ff13eaaf4
diff --git a/app-backup/borgmatic/borgmatic-1.5.18.ebuild b/app-backup/borgmatic/borgmatic-1.5.18.ebuild
deleted file mode 100644
index 4b739e7cd033..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.18.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
- ')"
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- dev-python/flexmock[${PYTHON_USEDEP}]
- ')
- )"
-
-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
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # Unlike the other two test files in integration/commands, which use the
- # relevant modules' respective APIs, test_borgmatic.py tries to call the
- # 'borgmatic' executable - which by the time we execute src_test will
- # not have been created yet. Adding --install to distutils_enable_tests would
- # likely take care of this - but between the aforementioned behaviour
- # inconsistency and the fact the only test run from this file as of version
- # 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
- rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
- distutils-r1_src_install
- systemd_dounit sample/systemd/borgmatic.{service,timer}
- keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "To generate a sample configuration file, run:"
- elog " generate-borgmatic-config"
- fi
- elog
- elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
deleted file mode 100644
index 32937adadba0..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Apparently in the flexmock universe, sys.stdout.write() takes two
-arguments rather than one. As of late July 2021, upstream hasn't said
-a word of comment on this; see
-https://github.com/flexmock/flexmock/issues/37
-
---- a/tests/unit/commands/test_borgmatic.py
-+++ b/tests/unit/commands/test_borgmatic.py
-@@ -448,7 +448,10 @@
- ['baz']
- )
- stdout = flexmock()
-- stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
-+ try:
-+ stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once()
-+ except flexmock.MethodSignatureError:
-+ stdout.should_receive('write').with_args('["foo", "bar", "baz"]', None).once()
- flexmock(module.sys).stdout = stdout
- arguments = {}
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-19 15:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-29 21:45 [gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/files/, app-backup/borgmatic/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2021-07-27 11:36 Marek Szuba
2021-07-28 23:38 Marek Szuba
2021-11-19 15:04 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox