Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/scan/metadata/
Date: Sat, 29 Jan 2022 17:40:36
Message-Id: 1643128878.0ec131cc84893f429da2c4486545a6c93d3447c0.ulm@gentoo
1 commit: 0ec131cc84893f429da2c4486545a6c93d3447c0
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 25 16:41:18 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 25 16:41:18 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ec131cc
7
8 repoman: Remove http compatibility code for metadata DTD
9
10 Commit 3950d76df says: "The http:// compat can be removed once the
11 Gentoo repository is updated to use https:// everywhere."
12
13 Bug: https://bugs.gentoo.org/552720
14 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
15
16 repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py
20 index b4e0ee933..0fb97a0df 100644
21 --- a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py
22 +++ b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py
23 @@ -127,7 +127,7 @@ class PkgMetadata(ScanBase, USEFlagChecks):
24 )
25 else:
26 doctype_system = _metadata_xml.docinfo.system_url
27 - if doctype_system.replace("http://", "https://") != metadata_dtd_uri:
28 + if doctype_system != metadata_dtd_uri:
29 if doctype_system is None:
30 system_problem = "but it is undefined"
31 else: