From 8eeadf2913f7c3946c14fbc99041580ac63fdda6 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Aug 26 2023 19:28:32 +0000 Subject: Fix paths and mode detection in deps.py listpaths Fix #490 --- diff --git a/src/FedoraReview/deps.py b/src/FedoraReview/deps.py index 8899c73..2a1de0d 100644 --- a/src/FedoraReview/deps.py +++ b/src/FedoraReview/deps.py @@ -17,6 +17,7 @@ """ Interface to package dependencies. """ +import re import shlex import subprocess @@ -326,7 +327,10 @@ def listpaths(pkg_filename): except StopIteration: return dirs, files try: - path, mode = line.rsplit(None, 10)[0:5:4] + first_number_match = re.search(r'\b\d+\b\s+\b\d+\b', line) + first_number_start = first_number_match.start() + path = line[:first_number_start].strip() + mode = line[first_number_start:].rsplit(None, 10)[3:4] except ValueError: # E. g., when given '(contains no files)' continue