[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/scan/metadata/
commit: 0ec131cc84893f429da2c4486545a6c93d3447c0 Author: Ulrich Müller gentoo org> AuthorDate: Tue Jan 25 16:41:18 2022 + Commit: Ulrich Müller gentoo org> CommitDate: Tue Jan 25 16:41:18 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ec131cc repoman: Remove http compatibility code for metadata DTD Commit 3950d76df says: "The http:// compat can be removed once the Gentoo repository is updated to use https:// everywhere." Bug: https://bugs.gentoo.org/552720 Signed-off-by: Ulrich Müller gentoo.org> repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py index b4e0ee933..0fb97a0df 100644 --- a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py +++ b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py @@ -127,7 +127,7 @@ class PkgMetadata(ScanBase, USEFlagChecks): ) else: doctype_system = _metadata_xml.docinfo.system_url -if doctype_system.replace("http://";, "https://";) != metadata_dtd_uri: +if doctype_system != metadata_dtd_uri: if doctype_system is None: system_problem = "but it is undefined" else:
[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/scan/metadata/
commit: 030e2fc8ba6cf6c28b582c9ccbb5343ece887776 Author: Zac Medico gentoo org> AuthorDate: Tue Jan 19 07:32:49 2021 + Commit: Zac Medico gentoo org> CommitDate: Tue Jan 19 07:33:33 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=030e2fc8 repoman: fix DeprecationWarning: invalid escape sequence \s Signed-off-by: Zac Medico gentoo.org> repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py index c1ba8e9f4..2e85cc3b9 100644 --- a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py +++ b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py @@ -101,7 +101,7 @@ class PkgMetadata(ScanBase, USEFlagChecks): indentation_chars = Counter() for l in etree.tostring(_metadata_xml).splitlines(): - indentation_chars.update(re.match(b"\s*", l).group(0)) + indentation_chars.update(re.match(rb"\s*", l).group(0)) if len(indentation_chars) > 1: self.qatracker.add_error("metadata.warning", "%s/metadata.xml: %s" % (xpkg, "inconsistent use of tabs and spaces in indentation")
[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/scan/metadata/, lib/portage/repository/
commit: be21bd79e63282e48d9202d18b89bfd132aa4b2f Author: Zac Medico gentoo org> AuthorDate: Tue Aug 6 03:38:10 2019 + Commit: Zac Medico gentoo org> CommitDate: Mon Aug 19 01:48:48 2019 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=be21bd79 repoman: support metadata/layout.conf restrict-allowed Bug: https://bugs.gentoo.org/690786 Signed-off-by: Zac Medico gentoo.org> lib/portage/repository/config.py | 8 +++- repoman/lib/repoman/modules/scan/metadata/restrict.py | 6 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py index 2b2b1e151..46bb6b65a 100644 --- a/lib/portage/repository/config.py +++ b/lib/portage/repository/config.py @@ -103,6 +103,7 @@ class RepoConfig(object): 'portage1_profiles_compat', 'priority', 'profile_formats', + 'restrict_allowed', 'sign_commit', 'sign_manifest', 'strict_misc_digests', @@ -339,7 +340,7 @@ class RepoConfig(object): for value in ('allow-missing-manifest', 'cache-formats', 'create-manifest', 'disable-manifest', 'manifest-hashes', - 'manifest-required-hashes', 'profile-formats', + 'manifest-required-hashes', 'profile-formats', 'restrict-allowed', 'sign-commit', 'sign-manifest', 'thin-manifest', 'update-changelog'): setattr(self, value.lower().replace("-", "_"), layout_data[value]) @@ -1142,6 +1143,11 @@ def parse_layout_conf(repo_location, repo_name=None): data['eapis-banned'] = tuple(layout_data.get('eapis-banned', '').split()) data['eapis-deprecated'] = tuple(layout_data.get('eapis-deprecated', '').split()) + restrict_allowed = layout_data.get('restrict-allowed') + if restrict_allowed is not None: + restrict_allowed = tuple(restrict_allowed.split()) + data['restrict-allowed'] = restrict_allowed + data['sign-commit'] = layout_data.get('sign-commits', 'false').lower() \ == 'true' diff --git a/repoman/lib/repoman/modules/scan/metadata/restrict.py b/repoman/lib/repoman/modules/scan/metadata/restrict.py index 99784f231..f39128b24 100644 --- a/repoman/lib/repoman/modules/scan/metadata/restrict.py +++ b/repoman/lib/repoman/modules/scan/metadata/restrict.py @@ -18,6 +18,10 @@ class RestrictChecks(ScanBase): ''' self.qatracker = kwargs.get('qatracker') self.repo_settings = kwargs.get('repo_settings') + if self.repo_settings.repo_config.restrict_allowed is None: + self._restrict_allowed = self.repo_settings.qadata.valid_restrict + else: + self._restrict_allowed = self.repo_settings.repo_config.restrict_allowed def check(self, **kwargs): xpkg = kwargs.get('xpkg') @@ -35,7 +39,7 @@ class RestrictChecks(ScanBase): if myrestrict: myrestrict = set(myrestrict) - mybadrestrict = myrestrict.difference(self.repo_settings.qadata.valid_restrict) + mybadrestrict = myrestrict.difference(self._restrict_allowed) if mybadrestrict: for mybad in mybadrestrict:
[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/scan/metadata/
commit: 73232537c3f7d8cb4121c0a2dee5b450de584e38 Author: Michał Górny gentoo org> AuthorDate: Thu Jun 20 12:33:01 2019 + Commit: Zac Medico gentoo org> CommitDate: Thu Jun 20 19:50:41 2019 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=73232537 Allow empty LICENSE in acct-* packages Since acct-* packages do not create any files (except for keepfile for the home directory), it is perfectly normal for the LICENSE to be empty. Signed-off-by: Zac Medico gentoo.org> repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py b/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py index 4c35bbc12..2edf8f7f2 100644 --- a/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py +++ b/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py @@ -39,8 +39,8 @@ class EbuildMetadata(ScanBase): ebuild = kwargs.get('ebuild').get() for pos, missing_var in enumerate(self.repo_settings.qadata.missingvars): if not ebuild.metadata.get(missing_var): - if kwargs.get('catdir') == "virtual" and \ - missing_var in ("HOMEPAGE", "LICENSE"): + if (kwargs.get('catdir') in ("acct-group", "acct-user", "virtual") + and missing_var in ("HOMEPAGE", "LICENSE")): continue if ebuild.live_ebuild and missing_var == "KEYWORDS": continue