Skip to content

Commit cf6f240

Browse files
Merge pull request #300 from nexB/add-debian-purl2meta
Get metadata for and scan debian packages from Purls
2 parents cc25d02 + 9907dea commit cf6f240

67 files changed

Lines changed: 3804 additions & 1934 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

minecode/management/commands/priority_queue.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,14 @@ def add_package_to_scan_queue(package):
120120

121121
def process_request(priority_resource_uri, _priority_router=priority_router):
122122
purl_to_visit = priority_resource_uri.uri
123+
source_purl = priority_resource_uri.source_uri
123124
try:
124125
if TRACE:
125126
logger.debug('visit_uri: uri: {}'.format(purl_to_visit))
126-
127-
errors = _priority_router.process(purl_to_visit)
127+
kwargs = dict()
128+
if source_purl:
129+
kwargs["source_purl"] = source_purl
130+
errors = _priority_router.process(purl_to_visit, **kwargs)
128131
if TRACE:
129132
new_uris_to_visit = list(new_uris_to_visit or [])
130133
logger.debug('visit_uri: new_uris_to_visit: {}'.format(new_uris_to_visit))

minecode/tests/testfiles/bower/expected_mapper_example1_bower.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,20 @@
4747
"license_detections":[
4848
{
4949
"license_expression":"bsd-new",
50+
"license_expression_spdx":"BSD-3-Clause",
5051
"matches":[
5152
{
52-
"score":100.0,
53+
"license_expression":"bsd-new",
54+
"spdx_license_expression":"BSD-3-Clause",
55+
"from_file":null,
5356
"start_line":1,
5457
"end_line":1,
58+
"matcher":"1-hash",
59+
"score":100.0,
5560
"matched_length":1,
5661
"match_coverage":100.0,
57-
"matcher":"1-hash",
58-
"license_expression":"bsd-new",
59-
"rule_identifier":"bsd-new_1135.RULE",
6062
"rule_relevance":100,
63+
"rule_identifier":"bsd-new_1135.RULE",
6164
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1135.RULE",
6265
"matched_text":"NewBSD"
6366
}

minecode/tests/testfiles/cpan/expected_json_cpanmapper.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,20 @@
3939
"license_detections":[
4040
{
4141
"license_expression":"mit",
42+
"license_expression_spdx":"MIT",
4243
"matches":[
4344
{
44-
"score":100.0,
45+
"license_expression":"mit",
46+
"spdx_license_expression":"MIT",
47+
"from_file":null,
4548
"start_line":1,
4649
"end_line":1,
50+
"matcher":"1-spdx-id",
51+
"score":100.0,
4752
"matched_length":1,
4853
"match_coverage":100.0,
49-
"matcher":"1-spdx-id",
50-
"license_expression":"mit",
51-
"rule_identifier":"spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
5254
"rule_relevance":100,
55+
"rule_identifier":"spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
5356
"rule_url":null,
5457
"matched_text":"mit"
5558
}

0 commit comments

Comments
 (0)