mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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']: if jni_components == ['yes']:
jni_components = [''] 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: for d in jni_components:
if d: if d:
logging.info("Building native code in '%s'" % 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:] gitsvn_cmd += ' -t %s' % i[5:]
elif i.startswith('branches='): elif i.startswith('branches='):
gitsvn_cmd += ' -b %s' % i[9:] 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 self.clone_failed = True
raise VCSException("Git svn clone failed") raise VCSException("Git svn clone failed", p.output)
else: 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 self.clone_failed = True
raise VCSException("Git svn clone failed") raise VCSException("Git svn clone failed", p.output)
self.checkrepo() self.checkrepo()
else: else:
self.checkrepo() self.checkrepo()