1 |
Update the default metadata.dtd URI used in repoman and Portage tests |
2 |
to use https://. However, allow also http:// form for the migration |
3 |
period. |
4 |
|
5 |
The http:// compat can be removed once the Gentoo repository is updated |
6 |
to use https:// everywhere. |
7 |
|
8 |
Bug: https://bugs.gentoo.org/552720 |
9 |
--- |
10 |
pym/portage/tests/resolver/ResolverPlayground.py | 2 +- |
11 |
repoman/pym/repoman/metadata.py | 2 +- |
12 |
repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py | 2 +- |
13 |
3 files changed, 3 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py |
16 |
index d8037194b..d3a5d8092 100644 |
17 |
--- a/pym/portage/tests/resolver/ResolverPlayground.py |
18 |
+++ b/pym/portage/tests/resolver/ResolverPlayground.py |
19 |
@@ -45,7 +45,7 @@ class ResolverPlayground(object): |
20 |
"unpack_dependencies", "use.aliases", "use.force", "use.mask", "layout.conf")) |
21 |
|
22 |
metadata_xml_template = """<?xml version="1.0" encoding="UTF-8"?> |
23 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
24 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
25 |
<pkgmetadata> |
26 |
<maintainer type="person"> |
27 |
<email>maintainer-needed@g.o</email> |
28 |
diff --git a/repoman/pym/repoman/metadata.py b/repoman/pym/repoman/metadata.py |
29 |
index 53bda6305..11ec1aaf8 100644 |
30 |
--- a/repoman/pym/repoman/metadata.py |
31 |
+++ b/repoman/pym/repoman/metadata.py |
32 |
@@ -29,7 +29,7 @@ if sys.hexversion >= 0x3000000: |
33 |
|
34 |
# Note: This URI is hardcoded in all metadata.xml files. We can't |
35 |
# change it without updating all the xml files in the tree. |
36 |
-metadata_dtd_uri = 'http://www.gentoo.org/dtd/metadata.dtd' |
37 |
+metadata_dtd_uri = 'https://www.gentoo.org/dtd/metadata.dtd' |
38 |
metadata_xsd_uri = 'https://www.gentoo.org/xml-schema/metadata.xsd' |
39 |
# force refetch if the local copy creation time is older than this |
40 |
metadata_xsd_ctime_interval = 60 * 60 * 24 * 7 # 7 days |
41 |
diff --git a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py |
42 |
index 6a0f501ec..3c38697fe 100644 |
43 |
--- a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py |
44 |
+++ b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py |
45 |
@@ -120,7 +120,7 @@ class PkgMetadata(ScanBase, USEFlagChecks): |
46 |
"%s/metadata.xml: %s" % (xpkg, "DOCTYPE is missing")) |
47 |
else: |
48 |
doctype_system = _metadata_xml.docinfo.system_url |
49 |
- if doctype_system != metadata_dtd_uri: |
50 |
+ if doctype_system.replace('http://', 'https://') != metadata_dtd_uri: |
51 |
if doctype_system is None: |
52 |
system_problem = "but it is undefined" |
53 |
else: |
54 |
-- |
55 |
2.16.1 |