diff options
Diffstat (limited to 'app-backup/borgmatic/files')
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.5.16-flexmock_write_args.patch | 19 | ||||
| -rw-r--r-- | app-backup/borgmatic/files/borgmatic-1.5.16-systemd_service_bin_path.patch | 8 |
2 files changed, 27 insertions, 0 deletions
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 000000000000..32937adadba0 --- /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 000000000000..26298625fc1a --- /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 |