From ca35d9f255bf26dc0817273cd25ea5333a47b246 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 5 Jun 2016 00:25:30 +0200 Subject: [PATCH 1/2] remove passphrase from subprocess environment, fixes #1105 --- borg/remote.py | 1 + 1 file changed, 1 insertion(+) diff --git a/borg/remote.py b/borg/remote.py index 5662a8dbc..5768efad6 100644 --- a/borg/remote.py +++ b/borg/remote.py @@ -153,6 +153,7 @@ def __init__(self, location, create=False, lock_wait=None, lock=True, args=None) # pyinstaller binary adds LD_LIBRARY_PATH=/tmp/_ME... but we do not want # that the system's ssh binary picks up (non-matching) libraries from there env.pop('LD_LIBRARY_PATH', None) + env.pop('BORG_PASSPHRASE', None) # security: do not give secrets to subprocess self.p = Popen(borg_cmd, bufsize=0, stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env) self.stdin_fd = self.p.stdin.fileno() self.stdout_fd = self.p.stdout.fileno() From fb89152392a3179898b56a1ee06e8263915d19f4 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 6 Jun 2016 16:11:22 +0200 Subject: [PATCH 2/2] fix / clarify prune help, fixes #1143 --- borg/archiver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index f2825dfa1..fb1fa523e 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -1244,7 +1244,7 @@ def build_parser(self, args=None, prog=None): help='repository for which to break the locks') prune_epilog = textwrap.dedent(""" - The prune command prunes a repository by deleting archives not matching + The prune command prunes a repository by deleting all archives not matching any of the specified retention options. This command is normally used by automated backup scripts wanting to keep a certain number of historic backups. @@ -1252,7 +1252,7 @@ def build_parser(self, args=None, prog=None): most recent days with backups (days without backups do not count). The rules are applied from hourly to yearly, and backups selected by previous rules do not count towards those of later rules. The time that each backup - completes is used for pruning purposes. Dates and times are interpreted in + starts is used for pruning purposes. Dates and times are interpreted in the local timezone, and weeks go from Monday to Sunday. Specifying a negative number of archives to keep means that there is no limit.