[elbe-devel] [PATCH] validate: Remove check for apt-transport-https
bage at linutronix.de
bage at linutronix.de
Tue Nov 17 12:56:07 CET 2020
From: Bastian Germann <bage at linutronix.de>
apt-transport-https is not needed for HTTPS mirrors anymore with the initvm
switch to buster which happened over a year ago. This has an apt version
that has HTTPS support built-in. Remove the check.
Signed-off-by: Bastian Germann <bage at linutronix.de>
---
elbepack/validate.py | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/elbepack/validate.py b/elbepack/validate.py
index c1e5c771b..6ee5abc41 100644
--- a/elbepack/validate.py
+++ b/elbepack/validate.py
@@ -72,20 +72,4 @@ def validate_xml_content(xml):
"Use debootstrapvariant's attribute includepkgs "
"to make gnupg available in debootstrap.\n")
- primary_proto = xml.findtext("/project/mirror/primary_proto", "")
- https = (primary_proto.lower() == "https")
-
- if (not https
- and (dbsv is None
- or "apt-transport-https" not in dbsv.get("includepkgs", ""))):
- for url in xml.findall("/project/mirror/url-list/url"):
- b = url.findtext("binary", "")
- s = url.findtext("source", "")
- if b.startswith("https") or s.startswith("https"):
- errors.append("\nThe XML contains an HTTPS mirror. "
- "Use debootstrapvariant's attribute includepkgs "
- "to make apt-transport-https available in "
- "debootstrap.\n")
- break
-
return errors
--
2.29.2
More information about the elbe-devel
mailing list