diff --git a/Changelog b/Changelog index 48d8a8f6..65ae6ce7 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ * Fri Jul 20 2007 Jesse Keating - Don't quote things passed to mkisofs, not a shell +- Always log stdout before checking for stderr output * Fri Jul 06 2007 Jesse Keating - Include memtest86+ in the "Fedora" manifest diff --git a/pypungi/pungi.py b/pypungi/pungi.py index cc2950b8..da250df7 100755 --- a/pypungi/pungi.py +++ b/pypungi/pungi.py @@ -71,13 +71,14 @@ class Pungi: p1 = subprocess.Popen(command, cwd=rundir, stdout=output, stderr=error, universal_newlines=True) (out, err) = p1.communicate() + + log.info(out) + if p1.returncode != 0: log.error("Got an error from %s" % command[0]) log.error(err) raise OSError, "Got an error from %s" % command[0] - log.info(out) - def doBuildinstall(self): """Run anaconda-runtime's buildinstall on the tree."""