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

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 3e1eb34699a21f0230b95810aa496bd429e74641..b8671f8f92e9ab1d60e74fe525f12b9815e16262 100644 (file)
--- 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 93412f4b64094911e26224ac037c2b23e88f1436..cc8cf5ecb918ea06e88f65a18ddcfffea2388b9b 100644 (file)
--- 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()