From 6034bb36aad41ef8ea32fc8140bb694360a33d07 Mon Sep 17 00:00:00 2001 From: Tristan van Berkom Date: Wed, 11 Dec 2024 21:15:43 +0900 Subject: [PATCH 1/2] sourcemirrors: Adding __init__.py This is needed to properly support all methods of plugin loading, and is used in the `sources` and `elements` modules as well. --- src/buildstream_plugins/sourcemirrors/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/buildstream_plugins/sourcemirrors/__init__.py diff --git a/src/buildstream_plugins/sourcemirrors/__init__.py b/src/buildstream_plugins/sourcemirrors/__init__.py new file mode 100644 index 0000000..e69de29 From f9571ae4e1b33abe2930e9a49f5ddb88b78df208 Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Wed, 11 Dec 2024 17:00:11 +0100 Subject: [PATCH 2/2] sourcemirrors: fix translate_url signature to make pylint happy --- src/buildstream_plugins/sourcemirrors/gitlab_lfs_mirror.py | 2 +- src/buildstream_plugins/sourcemirrors/simple_mirror.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buildstream_plugins/sourcemirrors/gitlab_lfs_mirror.py b/src/buildstream_plugins/sourcemirrors/gitlab_lfs_mirror.py index c258cd8..a40d568 100644 --- a/src/buildstream_plugins/sourcemirrors/gitlab_lfs_mirror.py +++ b/src/buildstream_plugins/sourcemirrors/gitlab_lfs_mirror.py @@ -66,7 +66,7 @@ def configure(self, node): self.project = node.get_str("project") self.ref = node.get_str("ref", "master") - def translate_url(self, alias, alias_url, source_url, extra_data): + def translate_url(self, *, alias, alias_url, source_url, extra_data): project_id = quote(self.project.format(alias=alias), safe="") filename = quote(source_url, safe="") diff --git a/src/buildstream_plugins/sourcemirrors/simple_mirror.py b/src/buildstream_plugins/sourcemirrors/simple_mirror.py index 031e632..d22bc3c 100644 --- a/src/buildstream_plugins/sourcemirrors/simple_mirror.py +++ b/src/buildstream_plugins/sourcemirrors/simple_mirror.py @@ -48,7 +48,7 @@ def configure(self, node): self.url = node.get_str("url") - def translate_url(self, alias, alias_url, source_url, extra_data): + def translate_url(self, *, alias, alias_url, source_url, extra_data): base_url = self.url.format(alias=alias) translated_url = join(base_url, source_url)