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

Some refactoring.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-16 20:02:52 +00:00
parent 09d74cf827
commit b6414238bf
1 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

64
ognibuild/debian/file_search.py
View file

@ -42,38 +42,42 @@ def read_contents_file(f):
yield path, rest yield path, rest
def contents_urls_from_sources_entry(source, arches):
if source.invalid or source.disabled:
return
if source.type == "deb-src":
return
if source.type != "deb":
logging.warning("Invalid line in sources: %r", source)
return
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,
)
def contents_urls_from_sourceslist(sl, arch): def contents_urls_from_sourceslist(sl, arch):
# TODO(jelmer): Verify signatures, etc. # TODO(jelmer): Verify signatures, etc.
arches = [(arch, True), ("all", False)] arches = [(arch, True), ("all", False)]
for source in sl.list: for source in sl.list:
if source.invalid or source.disabled: yield from contents_urls_from_sources_entry(source, arches)
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,
)
def load_contents_url(url): def load_contents_url(url):
@ -158,10 +162,10 @@ class AptCachedContentsFileSearcher(FileSearcher):
urls = list( urls = list(
contents_urls_from_sourceslist(sl, get_build_architecture())) contents_urls_from_sourceslist(sl, get_build_architecture()))
cache_dirs = [ cache_dirs = set([
os.path.join(session.location, "var/lib/apt/lists"), os.path.join(session.location, "var/lib/apt/lists"),
"/var/lib/apt/lists", "/var/lib/apt/lists",
] ])
self._load_urls(urls, cache_dirs) self._load_urls(urls, cache_dirs)
def _load_urls(self, urls, cache_dirs): def _load_urls(self, urls, cache_dirs):