Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 10 additions & 11 deletions src/ffpuppet/minidump_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def dmp_files(src_dir: Path) -> list[Path]:
extra_data = load(out_fp)
except JSONDecodeError:
extra_data = {}
LOG.debug("invalid json in: %s", extra_data)
LOG.debug("invalid json in: %s", entry)
if "additional_minidumps" in extra_data:
for other in extra_data["additional_minidumps"].split(","):
prioritize.add(f"{entry.stem}-{other}.dmp")
Expand Down Expand Up @@ -320,16 +320,15 @@ def mdsw_available(cls, min_version: str = "0.15.2") -> bool:
)
return False
# version check
for cver, mver in zip(current_version.split("."), min_version.split(".")):
if int(cver) > int(mver):
break
if int(cver) < int(mver):
LOG.error(
"minidump-stackwalk '%s' is unsupported (minimum '%s')",
current_version,
min_version,
)
return False
current = tuple(int(x) for x in current_version.split("."))
minimum = tuple(int(x) for x in min_version.split("."))
if current < minimum:
LOG.error(
"minidump-stackwalk '%s' is unsupported (minimum '%s')",
current_version,
min_version,
)
return False
LOG.debug("detected minidump-stackwalk version '%s'", current_version)
return True

Expand Down
6 changes: 6 additions & 0 deletions src/ffpuppet/test_minidump_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ def test_minidump_parser_04(tmp_path):
"minidump-stackwalk",
True,
),
# minidump-stackwalk major version is higher
(
(CompletedProcess([], 0, stdout=b"minidump-stackwalk 1.0.0\n"),),
"minidump-stackwalk",
True,
),
# minidump-stackwalk is matches minimum version
(
(CompletedProcess([], 0, stdout=b"minidump-stackwalk 0.15.2\n"),),
Expand Down