Fixes to invirtibuilder for case of missing package in super-repo, missing

[invirt/packages/invirt-dev.git] / build-hooks / post-build

diff --git a/build-hooks/post-build b/build-hooks/post-build
index eeb8467..0acaefb 100755 (executable)
--- a/build-hooks/post-build
+++ b/build-hooks/post-build
@@ -96,12 +96,14 @@ def submit_completion_msg(succeeded, values, verbose=True, success=lambda x: x,
     values = dict(values)
     if succeeded:
         values['result'] = success(values['result'])
     values = dict(values)
     if succeeded:
         values['result'] = success(values['result'])

+        values['_extra'] = ''

     else:
         values['result'] = failure(values['result'])
     else:
         values['result'] = failure(values['result'])

+        values['_extra'] = '\nError: %s' % escape(sys.stdin.read())

     for key in ['commit', 'pocket', 'principal']:
         values[key] = escape(values[key])
     for key in ['commit', 'pocket', 'principal']:
         values[key] = escape(values[key])

-    msg = """Submission of %(commit)s to be built in %(pocket)s %(result)s.
-Build submitted by %(principal)s.""" % values
+    msg = """Submission of %(commit)s (%(package)s) to be built in %(pocket)s %(result)s.
+Build submitted by %(principal)s.%(_extra)s""" % values

     return msg
 
 def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x,
     return msg
 
 def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x,

@@ -260,8 +262,8 @@ def main():
                                  escape=zephyr_escape)
         instance = zephyr_config.get('instance', values['default_instance']) % values
         zsig = zephyr_config.get('zsig', 'XVM Buildbot') % values
                                  escape=zephyr_escape)
         instance = zephyr_config.get('instance', values['default_instance']) % values
         zsig = zephyr_config.get('zsig', 'XVM Buildbot') % values

-        common.captureOutput(['zwrite', '-c', klass, '-i', instance, '-s',
-                              zsig, '-d', '-m', msg],
+        common.captureOutput(['zwrite', '-c', klass, '-i', instance, '-s', zsig,
+                              '-O', 'auto', '-d', '-m', msg],

                              stdout=None, stderr=None)
 
     try:
                              stdout=None, stderr=None)
 
     try: