kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity

Revert some stuff from 94c29f9c37 that shouldn't have been commited

Browse Source
This commit is contained in:
Daniel Martí 2014-08-18 11:25:39 +02:00
parent 97d1724ca0
commit c5cab888e4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/build.py
View File

@ -564,7 +564,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if jni_components == ['yes']:
jni_components = ['']
cmd = [os.path.join(config['ndk_path'], "ndk-build"), "-j4"]
cmd = [os.path.join(config['ndk_path'], "ndk-build"), "-j1"]
for d in jni_components:
if d:
logging.info("Building native code in '%s'" % d)

10
fdroidserver/common.py
View File

@ -620,13 +620,15 @@ class vcs_gitsvn(vcs):
gitsvn_cmd += ' -t %s' % i[5:]
elif i.startswith('branches='):
gitsvn_cmd += ' -b %s' % i[9:]
if subprocess.call([gitsvn_cmd + " %s %s" % (remote_split[0], self.local)], shell=True) != 0:
p = SilentPopen([gitsvn_cmd + " %s %s" % (remote_split[0], self.local)], shell=True)
if p.returncode != 0:
self.clone_failed = True
raise VCSException("Git svn clone failed")
raise VCSException("Git svn clone failed", p.output)
else:
if subprocess.call([gitsvn_cmd + " %s %s" % (self.remote, self.local)], shell=True) != 0:
p = SilentPopen([gitsvn_cmd + " %s %s" % (self.remote, self.local)], shell=True)
if p.returncode != 0:
self.clone_failed = True
raise VCSException("Git svn clone failed")
raise VCSException("Git svn clone failed", p.output)
self.checkrepo()
else:
self.checkrepo()