[PATCH 1/1] fsck: be more careful when detecting par2

[Rob Browning]

Narrow the set of permissable exceptions, and check the exit status of
par2 --help too.

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---

Pushed to main.

lib/bup/cmd/fsck.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/bup/cmd/fsck.py b/lib/bup/cmd/fsck.py
index 585c7100..f4e89a27 100644
--- a/lib/bup/cmd/fsck.py
+++ b/lib/bup/cmd/fsck.py
@@ -25,11 +25,15 @@ def debug(s):
def par2_setup():
global par2_ok
try:
- run((b'par2', b'--help'), stdout=DEVNULL, stderr=DEVNULL, stdin=DEVNULL)
- except OSError:
+ sp = run((b'par2', b'--help'),
+ stdout=DEVNULL, stderr=DEVNULL, stdin=DEVNULL,
+ check=False)
+ except (FileNotFoundError, NotADirectoryError):
log('fsck: warning: par2 not found; disabling recovery features.\n')
- else:
+ if sp.returncode == 0:
par2_ok = 1
+ return
+ log('fsck: warning: par2 --help failed; disabling recovery features.\n')

def is_par2_parallel():
# A true result means it definitely allows -t1; a false result is
--
2.47.3