From: Daniel Martí Date: Mon, 18 Aug 2014 09:25:39 +0000 (+0200) Subject: Revert some stuff from 94c29f9c37 that shouldn't have been commited X-Git-Tag: 0.3.0~84 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c5cab888e4307835ab97413a1da5afa7fef361d0;p=fdroidserver.git Revert some stuff from 94c29f9c37 that shouldn't have been commited --- diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 3e1eb346..b8671f8f 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -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) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 93412f4b..cc8cf5ec 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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()