From 96e4062bcf2446e635e522e8b71ced178140edde Mon Sep 17 00:00:00 2001 From: micu Date: Fri, 17 Apr 2015 00:58:20 +0200 Subject: [PATCH] Fix project.properties dependency issue Correctly place scrlib references also in the case there is no project.properties file present in the original repository. This commit fixes a problem, which was introduced with 021df3c42420de542bf11f22948831023b47ebf3: If no project.properties file exists in the original project's source repo, place_srclib will not place a dependency --- even if there should be one: > if not os.path.isfile(proppath): > return Example app: fdroiddata/metadata/org.berlin_vegan.bvapp.txt --- fdroidserver/common.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 810cf729..a5a3e70f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1886,11 +1886,9 @@ def place_srclib(root_dir, number, libpath): proppath = os.path.join(root_dir, 'project.properties') lines = [] - if not os.path.isfile(proppath): - return - - with open(proppath, "r") as o: - lines = o.readlines() + if os.path.isfile(proppath): + with open(proppath, "r") as o: + lines = o.readlines() with open(proppath, "w") as o: placed = False