mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 15:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fall back to res/values to avoid @strings/app_name

Browse source
This commit is contained in:
Daniel Martí 2013-05-14 20:50:40 +02:00
parent 7b394e6893
commit f6fb7416c5
3 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
fdroidserver/checkupdates.py
View file

@ -58,10 +58,9 @@ def check_tags(app, sdk_path):
if len(app['builds']) == 0:
return (None, "Can't use Tags with no builds defined")
manifest = build_dir
app_dir = build_dir
if 'subdir' in app['builds'][-1]:
manifest = os.path.join(manifest, app['builds'][-1]['subdir'])
manifest = os.path.join(manifest, 'AndroidManifest.xml')
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
hver = None
hcode = "0"
@ -70,8 +69,8 @@ def check_tags(app, sdk_path):
vcs.gotorevision(tag)
# Only process tags where the manifest exists...
if os.path.exists(manifest):
version, vercode, package = common.parse_androidmanifest(manifest)
if os.path.exists(app_dir + '/AndroidManifest.xml'):
version, vercode, package = common.parse_androidmanifest(app_dir)
if package and package == app['id'] and version and vercode:
if int(vercode) > int(hcode):
hcode = str(int(vercode))
@ -116,12 +115,11 @@ def check_repomanifest(app, sdk_path, branch="master"):
if len(app['builds']) == 0:
return (None, "Can't use RepoManifest with no builds defined")
manifest = build_dir
app_dir = build_dir
if 'subdir' in app['builds'][-1]:
manifest = os.path.join(manifest, app['builds'][-1]['subdir'])
manifest = os.path.join(manifest, 'AndroidManifest.xml')
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
version, vercode, package = common.parse_androidmanifest(manifest)
version, vercode, package = common.parse_androidmanifest(app_dir)
if not package:
return (None, "Couldn't find package ID")
if package != app['id']: