chiark / gitweb /
checkupdates: don't blindly accept subdir
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 26 Oct 2015 15:29:26 +0000 (16:29 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 26 Oct 2015 15:29:26 +0000 (16:29 +0100)
This is unnecessary because dirs_with_manifest will pick it up anyway.
But the problem manifested because we weren't checking the package id
here.

fdroidserver/checkupdates.py

index 6705b90044d6e9e5d9c824cae5779ad227306509..9a924922cceea5212e2dec2659eff61982f640e9 100644 (file)
@@ -324,10 +324,6 @@ def possible_subdirs(app):
         build = app['builds'][-1]
         if build['gradle']:
             flavours = build['gradle']
-        subdir = build['subdir']
-        if subdir and os.path.isdir(os.path.join(build_dir, subdir)):
-            logging.debug("Adding possible subdir %s" % subdir)
-            yield subdir
 
     for d in dirs_with_manifest(build_dir):
         m_paths = common.manifest_paths(d, flavours)