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

checkupdates: don't ignore root directory

Browse source
This commit is contained in:
Daniel Martí 2015-10-25 19:09:55 +01:00
parent d5ec039dec
commit 1f42b83120
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/checkupdates.py
View file

@ -143,6 +143,9 @@ def check_tags(app, pattern):
vcs.gotorevision(tag) vcs.gotorevision(tag)
for subdir in possible_subdirs(app): for subdir in possible_subdirs(app):
if subdir == '.':
root_dir = build_dir
else:
root_dir = os.path.join(build_dir, subdir) root_dir = os.path.join(build_dir, subdir)
paths = common.manifest_paths(root_dir, flavours) paths = common.manifest_paths(root_dir, flavours)
version, vercode, package = \ version, vercode, package = \
@ -210,6 +213,9 @@ def check_repomanifest(app, branch=None):
hver = None hver = None
hcode = "0" hcode = "0"
for subdir in possible_subdirs(app): for subdir in possible_subdirs(app):
if subdir == '.':
root_dir = build_dir
else:
root_dir = os.path.join(build_dir, subdir) root_dir = os.path.join(build_dir, subdir)
paths = common.manifest_paths(root_dir, flavours) paths = common.manifest_paths(root_dir, flavours)
version, vercode, package = \ version, vercode, package = \
@ -328,8 +334,6 @@ def possible_subdirs(app):
package = common.parse_androidmanifests(m_paths, app['Update Check Ignore'])[2] package = common.parse_androidmanifests(m_paths, app['Update Check Ignore'])[2]
if app_matches_packagename(app, package): if app_matches_packagename(app, package):
subdir = os.path.relpath(d, build_dir) subdir = os.path.relpath(d, build_dir)
if subdir == '.':
continue
logging.debug("Adding possible subdir %s" % subdir) logging.debug("Adding possible subdir %s" % subdir)
yield subdir yield subdir