mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'clearer-srclibs' into 'master'

Browse source 
vcs_git: clearer error messages for checkrepo()

See merge request fdroid/fdroidserver!1634
This commit is contained in:
Hans-Christoph Steiner 2025-04-03 10:25:11 +00:00
commit 3582a12f18
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/common.py
View file

@ -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"`{' '.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):

6
fdroidserver/metadata.py
View file

@ -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)