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

Add "Update Check Name:Ignore"

Browse source
This commit is contained in:
Daniel Martí 2015-08-14 10:27:16 -07:00
parent e5bc581d0d
commit bb2598d358
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/fdroid.texi
View file

@ -1252,6 +1252,10 @@ specify the package name to search for. Useful when apps have a static package
name but change it programmatically in some app flavors, by e.g. appending name but change it programmatically in some app flavors, by e.g. appending
".open" or ".free" at the end of the package name. ".open" or ".free" at the end of the package name.
You can also use @code{Ignore} to ignore package name searching. This should
only be used in some specific cases, for example if the app's build.gradle
file does not contain the package name.
@node Update Check Data @node Update Check Data
@section Update Check Data @section Update Check Data

21
fdroidserver/checkupdates.py
View file

@ -80,6 +80,15 @@ def check_http(app):
return (None, msg) return (None, msg)
def app_matches_packagename(app, package):
if not package:
return False
appid = app['Update Check Name'] or app['id']
if appid == "Ignore":
return True
return appid == package
# Check for a new version by looking at the tags in the source repo. # Check for a new version by looking at the tags in the source repo.
# Whether this can be used reliably or not depends on # Whether this can be used reliably or not depends on
# the development procedures used by the project's developers. Use it with # the development procedures used by the project's developers. Use it with
@ -90,7 +99,6 @@ def check_tags(app, pattern):
try: try:
appid = app['Update Check Name'] or app['id']
if app['Repo Type'] == 'srclib': if app['Repo Type'] == 'srclib':
build_dir = os.path.join('build', 'srclib', app['Repo']) build_dir = os.path.join('build', 'srclib', app['Repo'])
repotype = common.getsrclibvcs(app['Repo']) repotype = common.getsrclibvcs(app['Repo'])
@ -138,7 +146,7 @@ def check_tags(app, pattern):
paths = common.manifest_paths(build_dir, flavours) paths = common.manifest_paths(build_dir, flavours)
version, vercode, package = \ version, vercode, package = \
common.parse_androidmanifests(paths, app['Update Check Ignore']) common.parse_androidmanifests(paths, app['Update Check Ignore'])
if not package or package != appid or not version or not vercode: if not app_matches_packagename(app, package) or not version or not vercode:
continue continue
logging.debug("Manifest exists. Found version {0} ({1})" logging.debug("Manifest exists. Found version {0} ({1})"
@ -173,7 +181,6 @@ def check_repomanifest(app, branch=None):
try: try:
appid = app['Update Check Name'] or app['id']
if app['Repo Type'] == 'srclib': if app['Repo Type'] == 'srclib':
build_dir = os.path.join('build', 'srclib', app['Repo']) build_dir = os.path.join('build', 'srclib', app['Repo'])
repotype = common.getsrclibvcs(app['Repo']) repotype = common.getsrclibvcs(app['Repo'])
@ -211,9 +218,8 @@ def check_repomanifest(app, branch=None):
common.parse_androidmanifests(paths, app['Update Check Ignore']) common.parse_androidmanifests(paths, app['Update Check Ignore'])
if not package: if not package:
return (None, "Couldn't find package ID") return (None, "Couldn't find package ID")
if package != appid: if not app_matches_packagename(app, package):
return (None, "Package ID mismatch - expected {0}, got {1}" return (None, "Package ID mismatch - got {0}".format(package))
.format(appid, package))
if not version: if not version:
return (None, "Couldn't find latest version name") return (None, "Couldn't find latest version name")
if not vercode: if not vercode:
@ -307,7 +313,6 @@ def dirs_with_manifest(startdir):
# subdir relative to the build dir if found, None otherwise. # subdir relative to the build dir if found, None otherwise.
def check_changed_subdir(app): def check_changed_subdir(app):
appid = app['Update Check Name'] or app['id']
if app['Repo Type'] == 'srclib': if app['Repo Type'] == 'srclib':
build_dir = os.path.join('build', 'srclib', app['Repo']) build_dir = os.path.join('build', 'srclib', app['Repo'])
else: else:
@ -324,7 +329,7 @@ def check_changed_subdir(app):
logging.debug("Trying possible dir %s." % d) logging.debug("Trying possible dir %s." % d)
m_paths = common.manifest_paths(d, flavours) m_paths = common.manifest_paths(d, flavours)
package = common.parse_androidmanifests(m_paths, app['Update Check Ignore'])[2] package = common.parse_androidmanifests(m_paths, app['Update Check Ignore'])[2]
if package and package == appid: if app_matches_packagename(app, package):
logging.debug("Manifest exists in possible dir %s." % d) logging.debug("Manifest exists in possible dir %s." % d)
return os.path.relpath(d, build_dir) return os.path.relpath(d, build_dir)