#492 Fix paths and mode detection in deps.py listpaths
Merged 2 years ago by ngompa. Opened 2 years ago by eclipseo.
eclipseo/FedoraReview fix_listpaths  into  master

file modified
+6 -3
@@ -209,7 +209,10 @@ 

          except StopIteration:

              return dirs

          try:

-             path, mode = line.rsplit(None, 10)[0:5:4]

+             first_number_match = re.search(r'\s\d+\s\d+\s', line)

+             first_number_start = first_number_match.start()

+             path = line[:first_number_start].strip()

+             mode = line[first_number_start:].rsplit(None, 10)[3:4][0]

          except ValueError:

              # E. g., when given '(contains no files)'

              continue
@@ -327,10 +330,10 @@ 

          except StopIteration:

              return dirs, files

          try:

-             first_number_match = re.search(r'\b\d+\b\s+\b\d+\b', line)

+             first_number_match = re.search(r'\s\d+\s\d+\s', line)

              first_number_start = first_number_match.start()

              path = line[:first_number_start].strip()

-             mode = line[first_number_start:].rsplit(None, 10)[3:4]

+             mode = line[first_number_start:].rsplit(None, 10)[3:4][0]

          except ValueError:

              # E. g., when given '(contains no files)'

              continue

rebased onto 5f3d9ad

2 years ago

This seems good, merged.

Pull-Request has been merged by ngompa

2 years ago
Metadata