From 1f42b831206d5a84e578dfe5db244467c605e361 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sun, 25 Oct 2015 19:09:55 +0100 Subject: [PATCH] checkupdates: don't ignore root directory --- fdroidserver/checkupdates.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 32d6604e..f6ebc57a 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -143,7 +143,10 @@ def check_tags(app, pattern): vcs.gotorevision(tag) for subdir in possible_subdirs(app): - root_dir = os.path.join(build_dir, subdir) + if subdir == '.': + root_dir = build_dir + else: + root_dir = os.path.join(build_dir, subdir) paths = common.manifest_paths(root_dir, flavours) version, vercode, package = \ common.parse_androidmanifests(paths, app['Update Check Ignore']) @@ -210,7 +213,10 @@ def check_repomanifest(app, branch=None): hver = None hcode = "0" for subdir in possible_subdirs(app): - root_dir = os.path.join(build_dir, subdir) + if subdir == '.': + root_dir = build_dir + else: + root_dir = os.path.join(build_dir, subdir) paths = common.manifest_paths(root_dir, flavours) version, vercode, package = \ common.parse_androidmanifests(paths, app['Update Check Ignore']) @@ -328,8 +334,6 @@ def possible_subdirs(app): package = common.parse_androidmanifests(m_paths, app['Update Check Ignore'])[2] if app_matches_packagename(app, package): subdir = os.path.relpath(d, build_dir) - if subdir == '.': - continue logging.debug("Adding possible subdir %s" % subdir) yield subdir -- 2.30.2