kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

metadata: fix crash when there are duplicate metadata files

Browse Source 
The string had the variable 'appid' while the format() call had only the
variable 'path'.  This also standardizes on 'appid' like the rest of the
code.
This commit is contained in:
Hans-Christoph Steiner 2018-01-25 10:02:13 +01:00
parent d3caf09421
commit 099c98bc60
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fdroidserver/metadata.py
View File

@ -721,7 +721,7 @@ def read_metadata(xref=True, check_vcs=[], refresh=True, sort_by_time=False):
exception. So the original .txt format is parsed first, at least until exception. So the original .txt format is parsed first, at least until
newer formats stabilize. newer formats stabilize.
check_vcs is the list of packageNames to check for .fdroid.yml in source check_vcs is the list of appids to check for .fdroid.yml in source
""" """
@ -754,11 +754,11 @@ def read_metadata(xref=True, check_vcs=[], refresh=True, sort_by_time=False):
for metadatapath in metadatafiles: for metadatapath in metadatafiles:
if metadatapath == '.fdroid.txt': if metadatapath == '.fdroid.txt':
warn_or_exception(_('.fdroid.txt is not supported! Convert to .fdroid.yml or .fdroid.json.')) warn_or_exception(_('.fdroid.txt is not supported! Convert to .fdroid.yml or .fdroid.json.'))
packageName, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath)) appid, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
if packageName in apps: if appid in apps:
warn_or_exception(_("Found multiple metadata files for {appid}") warn_or_exception(_("Found multiple metadata files for {appid}")
.format(path=packageName)) .format(appid=appid))
app = parse_metadata(metadatapath, packageName in check_vcs, refresh) app = parse_metadata(metadatapath, appid in check_vcs, refresh)
check_metadata(app) check_metadata(app)
apps[app.id] = app apps[app.id] = app
@ -818,7 +818,7 @@ def get_default_app_info(metadatapath=None):
manifestroot = fdroidserver.common.parse_xml(os.path.join(root, 'AndroidManifest.xml')) manifestroot = fdroidserver.common.parse_xml(os.path.join(root, 'AndroidManifest.xml'))
break break
if manifestroot is None: if manifestroot is None:
warn_or_exception(_("Cannot find a packageName for {path}!") warn_or_exception(_("Cannot find an appid for {path}!")
.format(path=metadatapath)) .format(path=metadatapath))
appid = manifestroot.attrib['package'] appid = manifestroot.attrib['package']
@ -906,8 +906,9 @@ def post_metadata_parse(app):
# Parse metadata for a single application. # Parse metadata for a single application.
# #
# 'metadatapath' - the filename to read. The package id for the application comes # 'metadatapath' - the filename to read. The "Application ID" aka
# from this filename. Pass None to get a blank entry. # "Package Name" for the application comes from this
# filename. Pass None to get a blank entry.
# #
# Returns a dictionary containing all the details of the application. There are # Returns a dictionary containing all the details of the application. There are
# two major kinds of information in the dictionary. Keys beginning with capital # two major kinds of information in the dictionary. Keys beginning with capital