From ad421a7a41fb67b949df6b0824b5b0ed8209c3a7 Mon Sep 17 00:00:00 2001 From: Alexander 'Leo' Bergolth Date: Fri, 13 Jan 2017 11:00:16 +0100 Subject: [PATCH] cosmetic changes for TW --- borg/archiver.py | 3 ++- borg/helpers.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index 03a03f84f..7d6ccd70f 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -995,7 +995,8 @@ class Archiver: an exclude pattern, the file is backed up. Note that the default pattern style for `--pattern` and `--patterns-from` is - shell style (`sh:`), so those patterns behave like rsync include/exclude patterns. + shell style (`sh:`), so those patterns behave similar to rsync include/exclude + patterns. Patterns (`--pattern`) and excludes (`--exclude`) from the command line are considered first (in the order of appearance). Then patterns from `--pattern-from` diff --git a/borg/helpers.py b/borg/helpers.py index 93ece0823..08b7e8169 100644 --- a/borg/helpers.py +++ b/borg/helpers.py @@ -312,8 +312,7 @@ def load_excludes(fh): both line ends are ignored. """ patterns = (line for line in (i.strip() for i in fh) if not line.startswith('#')) - return [parse_exclude_pattern(pattern) - for pattern in patterns if pattern] + return [parse_exclude_pattern(pattern) for pattern in patterns if pattern] def load_patterns(fh):