particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mpp: small whitespace fixes

Browse source 
Be PEP-8 complaint.
This commit is contained in:
Christian Kellner 2021-06-18 15:15:50 +02:00 • committed by Tom Gundersen
parent ab453bf81a
commit 3298a6461e
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tools/mpp.py
View file

@ -117,9 +117,12 @@ def element_enter(element, key, default):
element[key] = default.copy() element[key] = default.copy()
return element[key] return element[key]
host_subscriptions = None host_subscriptions = None
# Expand non-uris as paths relative to basedir into a file:/// uri # Expand non-uris as paths relative to basedir into a file:/// uri
def _dnf_expand_baseurl(baseurl, basedir): def _dnf_expand_baseurl(baseurl, basedir):
try: try:
result = urllib.parse.urlparse(baseurl) result = urllib.parse.urlparse(baseurl)
@ -130,6 +133,7 @@ def _dnf_expand_baseurl(baseurl, basedir):
pass pass
return baseurl return baseurl
def _dnf_repo(conf, desc, basedir): def _dnf_repo(conf, desc, basedir):
repo = dnf.repo.Repo(desc["id"], conf) repo = dnf.repo.Repo(desc["id"], conf)
url = None url = None
@ -141,7 +145,7 @@ def _dnf_repo(conf, desc, basedir):
for key in desc.keys(): for key in desc.keys():
if key in skip_keys: if key in skip_keys:
continue # We handled this already continue # We handled this already
if key in url_keys: if key in url_keys:
url = desc[key] url = desc[key]
@ -178,6 +182,7 @@ def _dnf_repo(conf, desc, basedir):
return repo return repo
def _dnf_base(mpp_depsolve, persistdir, cachedir, basedir): def _dnf_base(mpp_depsolve, persistdir, cachedir, basedir):
arch = mpp_depsolve["architecture"] arch = mpp_depsolve["architecture"]
module_platform_id = mpp_depsolve["module-platform-id"] module_platform_id = mpp_depsolve["module-platform-id"]
@ -200,6 +205,7 @@ def _dnf_base(mpp_depsolve, persistdir, cachedir, basedir):
base.fill_sack(load_system_repo=False) base.fill_sack(load_system_repo=False)
return base return base
def _dnf_resolve(mpp_depsolve, basedir): def _dnf_resolve(mpp_depsolve, basedir):
deps = [] deps = []
@ -248,6 +254,7 @@ def _dnf_resolve(mpp_depsolve, basedir):
return deps return deps
class ManifestFile: class ManifestFile:
@staticmethod @staticmethod
def load(path): def load(path):
@ -274,11 +281,11 @@ class ManifestFile:
raise ValueError(f"Incompatible manifest version {m.version}") raise ValueError(f"Incompatible manifest version {m.version}")
return m return m
def write(self, file, sort_keys=False): def write(self, file, sort_keys=False):
json.dump(self.root, file, indent=2, sort_keys=sort_keys) json.dump(self.root, file, indent=2, sort_keys=sort_keys)
file.write("\n") file.write("\n")
class ManifestFileV1(ManifestFile): class ManifestFileV1(ManifestFile):
def __init__(self, path, data): def __init__(self, path, data):
super(ManifestFileV1, self).__init__(path, data, 1) super(ManifestFileV1, self).__init__(path, data, 1)
@ -342,12 +349,12 @@ class ManifestFileV1(ManifestFile):
packages.append(checksum) packages.append(checksum)
data = { "url": dep["url"] } data = {"url": dep["url"]}
if "secrets" in dep: if "secrets" in dep:
data["secrets"] = dep["secrets"] data["secrets"] = dep["secrets"]
self.source_urls[checksum] = data self.source_urls[checksum] = data
def process_depsolves(self, pipeline = None): def process_depsolves(self, pipeline=None):
if pipeline == None: if pipeline == None:
pipeline = self.pipeline pipeline = self.pipeline
stages = element_enter(pipeline, "stages", []) stages = element_enter(pipeline, "stages", [])
@ -358,6 +365,7 @@ class ManifestFileV1(ManifestFile):
if "pipeline" in build: if "pipeline" in build:
self.process_depsolves(build["pipeline"]) self.process_depsolves(build["pipeline"])
class ManifestFileV2(ManifestFile): class ManifestFileV2(ManifestFile):
def __init__(self, path, data): def __init__(self, path, data):
super(ManifestFileV2, self).__init__(path, data, 2) super(ManifestFileV2, self).__init__(path, data, 2)
@ -419,7 +427,7 @@ class ManifestFileV2(ManifestFile):
checksum = dep["checksum"] checksum = dep["checksum"]
refs[checksum] = {} refs[checksum] = {}
data = { "url": dep["url"] } data = {"url": dep["url"]}
if "secrets" in dep: if "secrets" in dep:
data["secrets"] = dep["secrets"] data["secrets"] = dep["secrets"]
self.source_urls[checksum] = data self.source_urls[checksum] = data
@ -432,6 +440,7 @@ class ManifestFileV2(ManifestFile):
for stage in stages: for stage in stages:
self._process_depsolve(stage) self._process_depsolve(stage)
dnf_cache = None dnf_cache = None
if __name__ == "__main__": if __name__ == "__main__":