diff options
| author | Jesse Keating <jkeating@redhat.com> | 2010-01-05 20:29:57 -0800 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2010-01-05 20:29:57 -0800 |
| commit | 7c7ccef930ad230b5b49bdb4777e4166eab63059 (patch) | |
| tree | 1d0f0cf2f7c76d3a68daf17fcd3fae7cace906c3 /src | |
| parent | b66a0bd551990e20bd60eb9f1f313fc3973040e5 (diff) | |
| download | fedora-packager-7c7ccef930ad230b5b49bdb4777e4166eab63059.tar.gz fedora-packager-7c7ccef930ad230b5b49bdb4777e4166eab63059.tar.xz fedora-packager-7c7ccef930ad230b5b49bdb4777e4166eab63059.zip | |
Make sure we capture error output correctly
Diffstat (limited to 'src')
| -rw-r--r-- | src/fedpkg/__init__.py | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/src/fedpkg/__init__.py b/src/fedpkg/__init__.py index 8ad3951..cf45f6c 100644 --- a/src/fedpkg/__init__.py +++ b/src/fedpkg/__init__.py @@ -125,12 +125,14 @@ def clean(dry=False, useignore=True): # Run it! log.debug('Running: %s' % subprocess.list2cmdline(cmd)) try: - proc = subprocess.Popen(cmd, stderr=subprocess.STDOUT, + proc = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE) - output = proc.communicate() + output, error = proc.communicate() except OSError, e: raise FedpkgError(e) - log.info(output[0]) + log.info(output) + if error: + log.error(error) return proc.returncode def clone(module, user, branch=None): @@ -246,12 +248,14 @@ class PackageModule: # Run the command and capture output log.debug('Running: %s' % ' '.join(cmd)) try: - proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.STDOUT, + proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True) - output = proc.communicate() + output, error = proc.communicate() except OSError, e: raise FedpkgError(e) - log.info(output[0]) + log.info(output) + if error: + log.error(error) return proc.returncode def getver(self): @@ -316,12 +320,14 @@ class PackageModule: # Run the command and capture output log.debug('Running: %s' % ' '.join(cmd)) try: - proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.STDOUT, + proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True) - output = proc.communicate() + output, error = proc.communicate() except OSError, e: raise FedpkgError(e) - log.info(output[0]) + log.info(output) + if error: + log.error(error) return proc.returncode def lint(self): @@ -348,11 +354,14 @@ class PackageModule: # Run the command log.debug('Running: %s' % subprocess.list2cmdline(cmd)) try: - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE) - output = proc.communicate() + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + output, error = proc.communicate() except OSError, e: raise FedpkgError(e) - log.info(output[0]) + log.info(output) + if error: + log.error(error) return proc.returncode def local(self, arch=None, hashtype='sha256'): @@ -384,16 +393,19 @@ class PackageModule: # Run the command log.debug('Running: %s' % ' '.join(cmd)) try: - proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.STDOUT, + proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True) - output = proc.communicate() + output, error = proc.communicate() except OSError, e: raise FedpkgError(e) outfile = open(os.path.join(self.path, '.build-%s-%s.log' % (self.ver, self.rel)), 'w') - outfile.writelines(output[0]) + outfile.writelines(output) + log.info(output) + if error: + outfile.writelines(error) + log.error(error) outfile.close() - log.info(output[0]) return proc.returncode def new_sources(self, files): @@ -425,12 +437,14 @@ class PackageModule: # Run the command and capture output log.debug('Running: %s' % ' '.join(cmd)) try: - proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.STDOUT, + proc = subprocess.Popen(' '.join(cmd), stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True) - output = proc.communicate() + output, error = proc.communicate() except OSError, e: raise FedpkgError(e) - log.info(output[0]) + log.info(output) + if error: + log.error(error) return(proc.returncode) def sources(self, outdir=None): |