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

Improve build output situation since logging changes

Browse source
This commit is contained in:
Ciaran Gultnieks 2014-02-15 23:27:19 +00:00
parent 995e5c84f0
commit cb3a08ff4b
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -1073,11 +1073,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
for d in update_dirs:
subdir = os.path.join(root_dir, d)
if d == '.':
logging.info("Updating main project")
print("Updating main project")
cmd = parms + ['-p', d]
else:
logging.info("Updating subproject %s" % d)
print("Updating subproject %s" % d)
cmd = lparms + ['-p', d]
print cmd
print ' '.join(cmd)
p = FDroidPopen(cmd, cwd=root_dir)
# Check to see whether an error was returned without a proper exit
# code (this is the case for the 'no target set or target invalid'
@ -1339,6 +1341,10 @@ def FDroidPopen(commands, cwd=None, output=True):
logging.info("Directory: %s" % cwd)
logging.info("> %s" % ' '.join(commands))
if cwd:
print("Directory: %s" % cwd)
print("> %s" % ' '.join(commands))
result = PopenResult()
p = subprocess.Popen(commands, cwd=cwd,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,