upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-09 00:32:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #5957 from Gu1nness/5734-1.1-maint

Browse source 
Use an exception catching to avoid a stack trace
This commit is contained in:
TW 2021-08-14 11:04:03 +02:00 committed by GitHub
commit abbc8a6cb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/borg/patterns.py
View file

@ -9,6 +9,7 @@ from enum import Enum
from . import shellpattern from . import shellpattern
from .helpers import clean_lines from .helpers import clean_lines
from .helpers import Error
def parse_patternfile_line(line, roots, ie_commands, fallback): def parse_patternfile_line(line, roots, ie_commands, fallback):
@ -53,8 +54,11 @@ class ArgparsePatternFileAction(argparse.Action):
Lines empty or starting with '#' after stripping whitespace on both line ends are ignored. Lines empty or starting with '#' after stripping whitespace on both line ends are ignored.
""" """
filename = values[0] filename = values[0]
with open(filename) as f: try:
self.parse(f, args) with open(filename) as f:
self.parse(f, args)
except FileNotFoundError as e:
raise Error(str(e))
def parse(self, fobj, args): def parse(self, fobj, args):
load_pattern_file(fobj, args.paths, args.patterns) load_pattern_file(fobj, args.paths, args.patterns)