From 3298a6461ea2c89e2712ad4536f2f8d540556807 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 18 Jun 2021 15:15:50 +0200 Subject: [PATCH] mpp: small whitespace fixes Be PEP-8 complaint. --- tools/mpp.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/mpp.py b/tools/mpp.py index 71f1fd07..624797ad 100755 --- a/tools/mpp.py +++ b/tools/mpp.py @@ -117,9 +117,12 @@ def element_enter(element, key, default): element[key] = default.copy() return element[key] + host_subscriptions = None # Expand non-uris as paths relative to basedir into a file:/// uri + + def _dnf_expand_baseurl(baseurl, basedir): try: result = urllib.parse.urlparse(baseurl) @@ -130,6 +133,7 @@ def _dnf_expand_baseurl(baseurl, basedir): pass return baseurl + def _dnf_repo(conf, desc, basedir): repo = dnf.repo.Repo(desc["id"], conf) url = None @@ -141,7 +145,7 @@ def _dnf_repo(conf, desc, basedir): for key in desc.keys(): if key in skip_keys: - continue # We handled this already + continue # We handled this already if key in url_keys: url = desc[key] @@ -178,6 +182,7 @@ def _dnf_repo(conf, desc, basedir): return repo + def _dnf_base(mpp_depsolve, persistdir, cachedir, basedir): arch = mpp_depsolve["architecture"] 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) return base + def _dnf_resolve(mpp_depsolve, basedir): deps = [] @@ -248,6 +254,7 @@ def _dnf_resolve(mpp_depsolve, basedir): return deps + class ManifestFile: @staticmethod def load(path): @@ -274,11 +281,11 @@ class ManifestFile: raise ValueError(f"Incompatible manifest version {m.version}") return m - def write(self, file, sort_keys=False): json.dump(self.root, file, indent=2, sort_keys=sort_keys) file.write("\n") + class ManifestFileV1(ManifestFile): def __init__(self, path, data): super(ManifestFileV1, self).__init__(path, data, 1) @@ -342,12 +349,12 @@ class ManifestFileV1(ManifestFile): packages.append(checksum) - data = { "url": dep["url"] } + data = {"url": dep["url"]} if "secrets" in dep: data["secrets"] = dep["secrets"] self.source_urls[checksum] = data - def process_depsolves(self, pipeline = None): + def process_depsolves(self, pipeline=None): if pipeline == None: pipeline = self.pipeline stages = element_enter(pipeline, "stages", []) @@ -358,6 +365,7 @@ class ManifestFileV1(ManifestFile): if "pipeline" in build: self.process_depsolves(build["pipeline"]) + class ManifestFileV2(ManifestFile): def __init__(self, path, data): super(ManifestFileV2, self).__init__(path, data, 2) @@ -419,7 +427,7 @@ class ManifestFileV2(ManifestFile): checksum = dep["checksum"] refs[checksum] = {} - data = { "url": dep["url"] } + data = {"url": dep["url"]} if "secrets" in dep: data["secrets"] = dep["secrets"] self.source_urls[checksum] = data @@ -432,6 +440,7 @@ class ManifestFileV2(ManifestFile): for stage in stages: self._process_depsolve(stage) + dnf_cache = None if __name__ == "__main__":