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

Make a few Popens silent

Browse source
This commit is contained in:
Daniel Martí 2014-07-09 19:15:39 +02:00
parent 69725c3f4c
commit a834ff4ab2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -534,7 +534,7 @@ class vcs_git(vcs):
p = SilentPopen(['git', 'submodule', 'foreach', '--recursive'] + cmd, cwd=self.local) p = SilentPopen(['git', 'submodule', 'foreach', '--recursive'] + cmd, cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git submodule reset failed", p.output) raise VCSException("Git submodule reset failed", p.output)
p = FDroidPopen(['git', 'submodule', 'sync'], cwd=self.local) p = SilentPopen(['git', 'submodule', 'sync'], cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git submodule sync failed", p.output) raise VCSException("Git submodule sync failed", p.output)
p = FDroidPopen(['git', 'submodule', 'update', '--init', '--force', '--recursive'], cwd=self.local) p = FDroidPopen(['git', 'submodule', 'update', '--init', '--force', '--recursive'], cwd=self.local)
@ -920,7 +920,7 @@ def remove_debuggable_flags(root_dir):
for root, dirs, files in os.walk(root_dir): for root, dirs, files in os.walk(root_dir):
if 'AndroidManifest.xml' in files: if 'AndroidManifest.xml' in files:
path = os.path.join(root, 'AndroidManifest.xml') path = os.path.join(root, 'AndroidManifest.xml')
p = FDroidPopen(['sed', '-i', 's/android:debuggable="[^"]*"//g', path]) p = SilentPopen(['sed', '-i', 's/android:debuggable="[^"]*"//g', path])
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to remove debuggable flags of %s" % path) raise BuildException("Failed to remove debuggable flags of %s" % path)
@ -1254,7 +1254,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if build['target']: if build['target']:
n = build["target"].split('-')[1] n = build["target"].split('-')[1]
FDroidPopen(['sed', '-i', SilentPopen(['sed', '-i',
's@compileSdkVersion *[0-9]*@compileSdkVersion ' + n + '@g', 's@compileSdkVersion *[0-9]*@compileSdkVersion ' + n + '@g',
'build.gradle'], 'build.gradle'],
cwd=root_dir) cwd=root_dir)