kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Merge branch 'master' of gitorious.org:f-droid/fdroidserver

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-06-15 22:03:12 +01:00
commit 6be27ed572
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdroidserver/build.py
View File

@ -317,15 +317,15 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
# Run a build command if one is required... # Run a build command if one is required...
if 'build' in thisbuild: if 'build' in thisbuild:
prebuild = thisbuild['build'] cmd = thisbuild['build']
# Substitute source library paths into prebuild commands... # Substitute source library paths into commands...
for name, libpath in srclibpaths: for name, libpath in srclibpaths:
libpath = os.path.relpath(libpath, root_dir) libpath = os.path.relpath(libpath, root_dir)
prebuild = prebuild.replace('$$' + name + '$$', libpath) cmd = cmd.replace('$$' + name + '$$', libpath)
prebuild = prebuild.replace('$$SDK$$', sdk_path) cmd = cmd.replace('$$SDK$$', sdk_path)
prebuild = prebuild.replace('$$NDK$$', ndk_path) cmd = cmd.replace('$$NDK$$', ndk_path)
prebuild = prebuild.replace('$$MVN3$$', mvn3) cmd = cmd.replace('$$MVN3$$', mvn3)
p = subprocess.Popen(prebuild, cwd=root_dir, shell=True, p = subprocess.Popen(['bash', '-c', cmd], cwd=root_dir,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate() out, err = p.communicate()
if p.returncode != 0: if p.returncode != 0:

2
fdroidserver/common.py
View File

@ -872,7 +872,7 @@ def fetch_real_name(app_dir):
if not app_found: if not app_found:
if app_search(line): if app_search(line):
app_found = True app_found = True
else: if app_found:
if name is not None: if name is not None:
break break
matches = name_search(line) matches = name_search(line)