bodhi/masher.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit f414d7164704f6ebb2b57664440d50d6f0ff7c52
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Sep 1 13:29:15 2011 -0400
Output stdout/stderr from our comps-related commands
diff --git a/bodhi/masher.py b/bodhi/masher.py
index fe1b26f..e0dbb5a 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -514,10 +514,23 @@ class MashTask(Thread):
log.debug("running command: %s" % cmd)
subprocess.call(cmd, shell=True, cwd=comps_dir)
if comps_url.startswith('git://'):
- subprocess.call('git pull', shell=True, cwd=comps_dir)
+ log.debug('Running git pull')
+ p = subprocess.Popen('git pull', shell=True, cwd=comps_dir,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ out, err = p.communicate()
+ log.debug(out)
+ if err:
+ log.error(err)
else:
subprocess.call('cvs update', shell=True, cwd=comps_dir)
- subprocess.call('make', shell=True, cwd=comps_dir)
+
+ log.info('Merging translations')
+ p = subprocess.Popen('make', shell=True, cwd=comps_dir,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ out, err = p.communicate()
+ log.debug(out)
+ if err:
+ log.error(err)
def update_symlinks(self):
""" Stage our updates repository.
Show replies by date