summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-15 15:35:13 -0700
committerChris Larson <chris_larson@mentor.com>2010-12-15 15:35:17 -0700
commit3a4b5eb20e41bd3cecd9d7e8dff7d076d8a7bb9a (patch)
treee9489838557497ac30c3848c8b022a67d7b1e0df
parent7d80a5355cb540aae8d3082c1efebb72da4f93c6 (diff)
downloadbitbake-3a4b5eb20e41bd3cecd9d7e8dff7d076d8a7bb9a.tar.gz
build: fix FuncFailed for the no logfile case
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--lib/bb/build.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/bb/build.py b/lib/bb/build.py
index a2a4b9ee9..1bb5911a7 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -51,17 +51,13 @@ __builtins__['os'] = os
class FuncFailed(Exception):
def __init__(self, name, logfile = None):
self.logfile = logfile
- if logfile is None:
- self.name = None
- self.message = name
- else:
- self.name = name
- self.message = "Function '%s' failed" % name
+ self.name = name
+ self.message = "Function '%s' failed" % name
def __str__(self):
if self.logfile and os.path.exists(self.logfile):
- msg = "%s (see %s for further information)" % \
- (self.message, self.logfile)
+ msg = ("%s (see %s for further information)" %
+ (self.message, self.logfile))
else:
msg = self.message
return msg