From b42273a909f86776a0398077563d7b3fee92f3cb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 21 Feb 2011 11:00:34 +0000 Subject: lib/oe/path.py: Add expection class to handle the output argument Signed-off-by: Richard Purdie --- meta/lib/oe/path.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 74674bfee8..48138605d0 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -80,6 +80,13 @@ def symlink(source, destination, force=False): if e.errno != errno.EEXIST or os.readlink(destination) != source: raise +class CalledProcessError(Exception): + def __init__(self, retcode, cmd, output = None): + self.retcode = retcode + self.cmd = cmd + self.output = output + def __str__(self): + return "Command '%s' returned non-zero exit status %d with output %s" % (self.cmd, self.retcode, self.output) # Not needed when we move to python 2.7 def check_output(*popenargs, **kwargs): @@ -111,6 +118,6 @@ def check_output(*popenargs, **kwargs): cmd = kwargs.get("args") if cmd is None: cmd = popenargs[0] - raise subprocess.CalledProcessError(retcode, cmd, output=output) + raise CalledProcessError(retcode, cmd, output=output) return output -- cgit v1.2.3