From b1dbae97e769346246e8a36424c60ce89ef7a310 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 17 Nov 2009 08:21:56 -0500 Subject: [PATCH] rename "output","error" -> "stdout","stderr" in VCS._u_invoke() --- libbe/vcs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libbe/vcs.py b/libbe/vcs.py index 7484660..c260af1 100644 --- a/libbe/vcs.py +++ b/libbe/vcs.py @@ -474,13 +474,13 @@ class VCS(object): shell=True, cwd=cwd) except OSError, e : raise CommandError(args, status=e.args[0], stdout="", stderr=e) - output,error = q.communicate(input=stdin) + stdout,stderr = q.communicate(input=stdin) status = q.wait() if self.verboseInvoke == True: - print >> sys.stderr, "%d\n%s%s" % (status, output, error) + print >> sys.stderr, "%d\n%s%s" % (status, stdout, stderr) if status not in expect: - raise CommandError(args, status, output, error) - return status, output, error + raise CommandStderr(args, status, stdout, stderr) + return status, stdout, stderr def _u_invoke_client(self, *args, **kwargs): directory = kwargs.get('directory',None) expect = kwargs.get('expect', (0,)) -- 2.26.2