From 0d88a94192849d53b375cacc1bee5a55720c79de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Thu, 5 Dec 2024 16:56:34 +0100 Subject: [PATCH 1/3] metadata: rename srcdir -> srclibs_dir for clarity --- fdroidserver/metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 08d275ae..f5fcffac 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -538,10 +538,10 @@ def read_srclibs(): srclibs = {} - srcdir = Path('srclibs') - srcdir.mkdir(exist_ok=True) + srclibs_dir = Path('srclibs') + srclibs_dir.mkdir(exist_ok=True) - for metadatapath in sorted(srcdir.glob('*.yml')): + for metadatapath in sorted(srclibs_dir.glob('*.yml')): srclibs[metadatapath.stem] = parse_yaml_srclib(metadatapath) From 046c527ee8d056f95f33624501b8784d7782a572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Mon, 31 Mar 2025 12:13:57 +0200 Subject: [PATCH 2/3] vcs_git: clearer error messages for checkrepo() This updates error messages the help identify issues when loading srclibs and fixes pushing srclibs into build vms/containers. --- fdroidserver/common.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index b2127ddf..16731d4f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1523,10 +1523,15 @@ class vcs_git(vcs): it! This is called as a safety check. """ - p = FDroidPopen(['git', 'rev-parse', '--show-toplevel'], cwd=self.local, output=False) + cmd = ['git', 'rev-parse', '--show-toplevel'] + p = FDroidPopen(cmd, cwd=self.local, output=False) result = p.output.rstrip() + if p.returncode > 0: + raise VCSException( + f"error: `{' '.join(cmd)}` failed, (in '{os.path.abspath(self.local)}') {result}" + ) if Path(result) != Path(self.local).resolve(): - raise VCSException('Repository mismatch') + raise VCSException(f"Repository mismatch ('{self.local}' != '{result}')") def gotorevisionx(self, rev): if not os.path.exists(self.local): From 69f9f52ba225cf3a27d75d38b158457d828c7a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Wed, 2 Apr 2025 12:29:26 +0000 Subject: [PATCH 3/3] drop error prefix when raising VCSException in case retrieving git revision failed --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 16731d4f..4a30bb6b 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1528,7 +1528,7 @@ class vcs_git(vcs): result = p.output.rstrip() if p.returncode > 0: raise VCSException( - f"error: `{' '.join(cmd)}` failed, (in '{os.path.abspath(self.local)}') {result}" + f"`{' '.join(cmd)}` failed, (in '{os.path.abspath(self.local)}') {result}" ) if Path(result) != Path(self.local).resolve(): raise VCSException(f"Repository mismatch ('{self.local}' != '{result}')")