diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 6c09b0c9c..89ebc76bf 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1706,7 +1706,7 @@ def build_parser(self, 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. @@ -1735,7 +1735,7 @@ def build_parser(self, prog=None): up to 7 most recent days with backups (days without backups do not count). The rules are applied from secondly 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. diff --git a/src/borg/remote.py b/src/borg/remote.py index 4fb9463fc..170a9f2ef 100644 --- a/src/borg/remote.py +++ b/src/borg/remote.py @@ -157,6 +157,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()