Skip to content

Use an exception catching to avoid a stack trace #5957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 1 commit into from
Aug 14, 2021
Merged

Use an exception catching to avoid a stack trace #5957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/borg/patterns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from . import shellpattern
from .helpers import clean_lines
from .helpers import Error


def parse_patternfile_line(line, roots, ie_commands, fallback):
Expand Down Expand Up @@ -53,8 +54,11 @@ def __call__(self, parser, args, values, option_string=None):
Lines empty or starting with '#' after stripping whitespace on both line ends are ignored.
"""
filename = values[0]
with open(filename) as f:
self.parse(f, args)
try:
with open(filename) as f:
self.parse(f, args)
except FileNotFoundError as e:
raise Error(str(e))

def parse(self, fobj, args):
load_pattern_file(fobj, args.paths, args.patterns)
Expand Down