|
21 | 21 |
|
22 | 22 | from packagedcode import models
|
23 | 23 | from packagedcode.utils import get_ancestor
|
| 24 | +from packagedcode.utils import parse_maintainer_name_email |
24 | 25 |
|
25 | 26 | """
|
26 | 27 | Handle Debian package archives, control files and installed databases.
|
@@ -653,20 +654,20 @@ def build_package_data(debian_data, datasource_id, package_type='deb', distro=No
|
653 | 654 |
|
654 | 655 | maintainer = debian_data.get('maintainer')
|
655 | 656 | if maintainer:
|
656 |
| - maintainer_name, maintainer_email = parse_debian_maintainers(maintainer) |
| 657 | + maintainer_name, maintainer_email = parse_maintainer_name_email(maintainer) |
657 | 658 | party = models.Party(role='maintainer', name=maintainer_name, email=maintainer_email)
|
658 | 659 | parties.append(party)
|
659 | 660 |
|
660 | 661 | orig_maintainer = debian_data.get('original_maintainer')
|
661 | 662 | if orig_maintainer:
|
662 |
| - maintainer_name, maintainer_email = parse_debian_maintainers(orig_maintainer) |
| 663 | + maintainer_name, maintainer_email = parse_maintainer_name_email(orig_maintainer) |
663 | 664 | party = models.Party(role='maintainer', name=maintainer_name, email=maintainer_email)
|
664 | 665 | parties.append(party)
|
665 | 666 |
|
666 | 667 | uploaders = debian_data.get('uploaders')
|
667 | 668 | if uploaders:
|
668 | 669 | for uploader in uploaders.split(", "):
|
669 |
| - uploader_name, uploader_email = parse_debian_maintainers(uploader) |
| 670 | + uploader_name, uploader_email = parse_maintainer_name_email(uploader) |
670 | 671 | party = models.Party(role='uploader', name=uploader_name, email=uploader_email)
|
671 | 672 | parties.append(party)
|
672 | 673 |
|
@@ -736,26 +737,6 @@ def build_package_data(debian_data, datasource_id, package_type='deb', distro=No
|
736 | 737 | return models.PackageData.from_data(package_data, package_only)
|
737 | 738 |
|
738 | 739 |
|
739 |
| -def parse_debian_maintainers(maintainer): |
740 |
| - """ |
741 |
| - Get name and email values from a debian maintainer string. |
742 |
| -
|
743 |
| - Example string: |
744 |
| - Debian systemd Maintainers <[email protected]> |
745 |
| - """ |
746 |
| - email_wrappers = ["<", ">"] |
747 |
| - has_email = "@" in maintainer and all([ |
748 |
| - True |
749 |
| - for char in email_wrappers |
750 |
| - if char in maintainer |
751 |
| - ]) |
752 |
| - if not has_email: |
753 |
| - return maintainer, None |
754 |
| - |
755 |
| - name, _, email = maintainer.rpartition("<") |
756 |
| - return name.rstrip(" "), email.rstrip(">") |
757 |
| - |
758 |
| - |
759 | 740 | def populate_debian_namespace(packages):
|
760 | 741 | """
|
761 | 742 | For an iterable of debian `packages`, populate the
|
|
0 commit comments