[zorg] r329365 - report error messages in annotated_builder.py

[Bob Haarman via llvm-commits]

Author: inglorion
Date: Thu Apr  5 17:07:37 2018
New Revision: 329365

URL: http://llvm.org/viewvc/llvm-project?rev=329365&view=rev
Log:
report error messages in annotated_builder.py

Summary:
annotated_builder.py's report_step_exception() function would emit a
buildbot @@@STEP_EXCEPTION@@@ annotation, but had no way to report an
error message. This change adds that functionality and makes
annotated_builder.py use it. I also spotted and removed a redundant
check around a call to util.clean_dir().

Reviewers: gkistanova, hans, rnk

Reviewed By: rnk

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D45295

Modified:
    zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py

Modified: zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py?rev=329365&r1=329364&r2=329365&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py Thu Apr  5 17:07:37 2018
@@ -35,7 +35,9 @@ class AnnotatedBuilder:
     def report_build_step(self, step):
         util.report('@@@BUILD_STEP %s@@@' % (step,))
 
-    def report_step_exception(self):
+    def report_step_exception(self, exn=None):
+        if exn:
+            util.report(str(exn))
         util.report('@@@STEP_EXCEPTION@@@')
 
     def build_and_check_stage(
@@ -123,10 +125,9 @@ class AnnotatedBuilder:
         self.halt_on_failure()
         try:
             util.clean_dir(build_dir)
-        except OSError as e:
-            if e.errno != errno.ENOENT:
-                self.report_step_exception()
-                raise
+        except Exception as e:
+          self.report_step_exception(e)
+          raise
 
     def cmake(
         self,
@@ -233,8 +234,8 @@ class AnnotatedBuilder:
 
             for var in sorted(os.environ.keys()):
                 util.report('%s=%s' % (var, os.environ[var]))
-        except:
-            self.report_step_exception()
+        except Exception as e:
+            self.report_step_exception(e)
             raise
 
     def update_sources(self, source_dir, projects, revision=None, svn='svn'):
@@ -258,8 +259,8 @@ class AnnotatedBuilder:
                     util.mkdirp(path)
                     cmd = [svn, 'co'] + revision_args + [uri, '.']
                 util.report_run_cmd(cmd, cwd=path)
-        except:
-            self.report_step_exception()
+        except Exception as e:
+            self.report_step_exception(e)
             raise
 
     def run_steps(