From 0b26ec80d4613a8695e7dc3ca61a9da3633a70fa Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Mon, 29 Jan 2024 15:35:15 +0530 Subject: [PATCH] Add more debian mantainers clues Signed-off-by: Ayan Sinha Mahapatra --- src/packagedcode/debian.py | 5 +++++ .../data/debian/ubuntu-var-lib-dpkg/expected.json | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/packagedcode/debian.py b/src/packagedcode/debian.py index e3057d47efa..7cd54ecf42d 100644 --- a/src/packagedcode/debian.py +++ b/src/packagedcode/debian.py @@ -675,7 +675,12 @@ def build_package_data(debian_data, datasource_id, package_type='deb', distro=No maintainer_clues_for_namespace = { 'packages.debian.org': 'debian', + 'lists.debian.org': 'debian', + 'lists.alioth.debian.org': 'debian', + '@debian.org': 'debian', + 'debian-init-diversity@': 'debian', 'lists.ubuntu.com': 'ubuntu', + '@canonical.com': 'ubuntu', } diff --git a/tests/packagedcode/data/debian/ubuntu-var-lib-dpkg/expected.json b/tests/packagedcode/data/debian/ubuntu-var-lib-dpkg/expected.json index 3910737a618..13b9badc5fe 100644 --- a/tests/packagedcode/data/debian/ubuntu-var-lib-dpkg/expected.json +++ b/tests/packagedcode/data/debian/ubuntu-var-lib-dpkg/expected.json @@ -75,7 +75,7 @@ }, { "type": "deb", - "namespace": null, + "namespace": "debian", "name": "base-passwd", "version": "3.5.47", "qualifiers": { @@ -279,7 +279,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:deb/base-passwd@3.5.47?architecture=amd64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:deb/debian/base-passwd@3.5.47?architecture=amd64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "ubuntu-var-lib-dpkg/var/lib/dpkg/status", "ubuntu-var-lib-dpkg/var/lib/dpkg/info/base-passwd.md5sums" @@ -288,7 +288,7 @@ "debian_installed_status_db", "debian_installed_md5sums" ], - "purl": "pkg:deb/base-passwd@3.5.47?architecture=amd64" + "purl": "pkg:deb/debian/base-passwd@3.5.47?architecture=amd64" }, { "type": "deb", @@ -1832,7 +1832,7 @@ } ], "for_packages": [ - "pkg:deb/base-passwd@3.5.47?architecture=amd64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:deb/debian/base-passwd@3.5.47?architecture=amd64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2589,7 +2589,7 @@ }, { "type": "deb", - "namespace": null, + "namespace": "debian", "name": "base-passwd", "version": "3.5.47", "qualifiers": { @@ -2641,7 +2641,7 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "debian_installed_status_db", - "purl": "pkg:deb/base-passwd@3.5.47?architecture=amd64" + "purl": "pkg:deb/debian/base-passwd@3.5.47?architecture=amd64" }, { "type": "deb",