billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factor out contents_urls_from_sourceslist.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-16 04:29:27 +00:00
parent 1acda140cf
commit 1d6b83b2be
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
ognibuild/debian/apt.py
View file

@ -125,6 +125,40 @@ def url_to_cache_filename(url):
return parsed.hostname + parsed.path.replace("/", "_")
def contents_urls_from_sourceslist(sl, arch):
# TODO(jelmer): Verify signatures, etc.
arches = [(arch, True), ("all", False)]
for source in sl.list:
if source.invalid or source.disabled:
continue
if source.type == "deb-src":
continue
if source.type != "deb":
logging.warning("Invalid line in sources: %r", source)
continue
base_url = source.uri.rstrip("/")
name = source.dist.rstrip("/")
components = source.comps
if components:
dists_url = base_url + "/dists"
else:
dists_url = base_url
if components:
for component in components:
for arch, mandatory in arches:
yield (
"%s/%s/%s/Contents-%s"
% (dists_url, name, component, arch),
mandatory,
)
else:
for arch, mandatory in arches:
yield (
"%s/%s/Contents-%s" % (dists_url, name.rstrip("/"), arch),
mandatory,
)
class AptContentsFileSearcher(FileSearcher):
def __init__(self):
self._db = {}
@ -207,42 +241,8 @@ class AptContentsFileSearcher(FileSearcher):
# TODO(jelmer): Use aptsources.sourceslist.SourcesList
from .build import get_build_architecture
# TODO(jelmer): Verify signatures, etc.
urls = []
arches = [(get_build_architecture(), True), ("all", False)]
for source in sl.list:
if source.invalid or source.disabled:
continue
if source.type == "deb-src":
continue
if source.type != "deb":
logging.warning("Invalid line in sources: %r", source)
continue
base_url = source.uri.rstrip("/")
name = source.dist.rstrip("/")
components = source.comps
if components:
dists_url = base_url + "/dists"
else:
dists_url = base_url
if components:
for component in components:
for arch, mandatory in arches:
urls.append(
(
"%s/%s/%s/Contents-%s"
% (dists_url, name, component, arch),
mandatory,
)
)
else:
for arch, mandatory in arches:
urls.append(
(
"%s/%s/Contents-%s" % (dists_url, name.rstrip("/"), arch),
mandatory,
)
)
urls = list(
contents_urls_from_sourceslist(sl, get_build_architecture()))
return cls.from_urls(urls, cache_dirs=cache_dirs)
@staticmethod