From 34f52e4aac8ba20b27ff3f6c276631785676a058 Mon Sep 17 00:00:00 2001 From: mhagger Date: Sat, 16 Oct 2010 08:33:13 +0000 Subject: [PATCH] Rename local variables. Make them consistent with those used in the other functions in this file. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5290 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/process.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cvs2svn_lib/process.py b/cvs2svn_lib/process.py index 112935a3..a082d5d0 100644 --- a/cvs2svn_lib/process.py +++ b/cvs2svn_lib/process.py @@ -55,7 +55,7 @@ class CommandFailedException(Exception): pass -def check_command_runs(cmd, cmdname): +def check_command_runs(command, commandname): """Check whether the command CMD can be executed without errors. CMD is a list or string, as accepted by subprocess.Popen(). CMDNAME @@ -69,19 +69,19 @@ def check_command_runs(cmd, cmdname): try: pipe = subprocess.Popen( - cmd, + command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, ) except OSError, e: - raise CommandFailedException('error executing %s: %s' % (cmdname, e,)) + raise CommandFailedException('error executing %s: %s' % (commandname, e,)) pipe.stdin.close() pipe.stdout.read() errmsg = pipe.stderr.read() status = pipe.wait() if status or errmsg: - msg = 'error executing %s: status %s' % (cmdname, status,) + msg = 'error executing %s: status %s' % (commandname, status,) if errmsg: msg += ', error output:\n%s' % (errmsg,) raise CommandFailedException(msg) -- 2.11.4.GIT