mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 18:50:11 +02:00
Merge branch 'projectproperties' into 'master'
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
021df3c424
: 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
See merge request !47
This commit is contained in:
commit
1af774811d
@ -1890,11 +1890,9 @@ def place_srclib(root_dir, number, libpath):
|
|||||||
proppath = os.path.join(root_dir, 'project.properties')
|
proppath = os.path.join(root_dir, 'project.properties')
|
||||||
|
|
||||||
lines = []
|
lines = []
|
||||||
if not os.path.isfile(proppath):
|
if os.path.isfile(proppath):
|
||||||
return
|
with open(proppath, "r") as o:
|
||||||
|
lines = o.readlines()
|
||||||
with open(proppath, "r") as o:
|
|
||||||
lines = o.readlines()
|
|
||||||
|
|
||||||
with open(proppath, "w") as o:
|
with open(proppath, "w") as o:
|
||||||
placed = False
|
placed = False
|
||||||
|
Loading…
Reference in New Issue
Block a user