Skip to content

Commit 9b03794

Browse files
committed
Fix review comments
1 parent 0e39681 commit 9b03794

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

dfetch/reporting/sbom_reporter.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ def add_project(
8181
component.group = purl.namespace
8282

8383
vcs_url = purl.qualifiers.get("vcs_url", "")
84+
# ExternalReferenceType.VCS does not support ssh:// urls
8485
if vcs_url and "ssh://" not in vcs_url:
8586
component.external_references.add(
8687
ExternalReference(

dfetch/util/purl.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from packageurl import PackageURL
1111
from tldextract import TLDExtract
1212

13+
# Although tldextract can fetch the latest suffix list, we don't want that here
1314
NO_FETCH_EXTRACT = TLDExtract(suffix_list_urls=(), extra_suffixes=("local",))
1415

1516
# Matches SSH-style Git URLs like:
@@ -94,7 +95,9 @@ def remote_url_to_purl(
9495

9596
if "svn" in parsed.scheme or "svn." in parsed.netloc:
9697
namespace, name = _namespace_and_name_from_domain_and_path(parsed.netloc, path)
97-
namespace = namespace.replace("/svn/", "/").removeprefix("p/")
98+
if namespace.startswith("p/"):
99+
namespace = namespace[len("p/") :]
100+
namespace = namespace.replace("/svn/", "/")
98101

99102
else:
100103
match = SSH_REGEX.match(remote_url)

features/steps/generic_steps.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,9 @@ def check_content(
113113
text=actual,
114114
)
115115

116-
assert actual.strip() == expected.strip(), "\n".join(
117-
f"Line {line_nr}: Actual >>{actual.strip()}<< != Expected >>{expected.strip()}<<",
118-
"ACTUAL:",
119-
*actual_content,
116+
assert actual.strip() == expected.strip(), (
117+
f"Line {line_nr}: Actual >>{actual.strip()}<< != Expected >>{expected.strip()}<<\n"
118+
f"ACTUAL:\n{''.join(actual_content)}"
120119
)
121120

122121

0 commit comments

Comments
 (0)