Context Navigation

-                      r3035
+                      r3036
         b.validateBuild(pocket, package, commit)
     except b.InvalidBuild, e:
+        print >>sys.stderr, "E: %s" % e
+        msg = "E: %s" % e
+        print >>sys.stderr, msg
+        # Prevent an attack by submitting excessively long arguments
+        args = [arg[:min(len(arg), 80)] for arg in (pocket, package, commit)]
+        b.runHook('failed-submit', args + [principal], stdin_str=msg)
         sys.exit(1)
 …
     q.close()
     os.rename(q_name, q_path)
+    short_commit = b.canonicalize_commit(package, commit, shorten=True)
+    b.runHook('post-submit', [pocket, package, short_commit, principal])
+    print '%s, your job to build %s for %s:%s has been submitted!' % (principal, short_commit, package, pocket)

trunk/packages/invirt-dev/invirtibuilder

-                      r3035
+                      r3036
         shutil.rmtree(workdir)
-def reportBuild(build):
-    """Run hooks to report the results of a build attempt."""
-    c.captureOutput(['run-parts',
-                   '--arg=%s' % build.build_id,
-                   '--',
-                   b._HOOKS_DIR])
 def build():
     """Deal with items in the build queue.
 …
             db.version = str(b.getVersion(package, commit))
+            b.runHook('pre-build', [str(db.build_id), db.pocket, db.package,
+                                    db.commit, db.principal, db.version, str(db.inserted_at)])
             # If validateBuild returns something other than True, then
 …
             os.unlink(os.path.join(b._QUEUE_DIR, build))
+            reportBuild(db)
+            if db.succeeded:
+                b.runHook('post-build', [str(db.build_id)])
+            else:
+                b.runHook('failed-build', [str(db.build_id)])
 class Invirtibuilder(pyinotify.ProcessEvent):

-                      r3035
+                      r3036
 _REPO_DIR = '/srv/git'
 _LOG_DIR = '/var/log/invirt/builds'
 _HOOKS_DIR = '/usr/share/invirt-dev/build.d'
+_HOOKS_DIR = '/usr/share/invirt-dev/build-hooks'
 …
     return changelog.Changelog(getGitFile(package, ref, 'debian/changelog'))
+def runHook(hook, args=[], stdin_str=None):
+    """Run a named hook."""
+    hook = os.path.join(_HOOKS_DIR, hook)
+    try:
+        c.captureOutput([hook] + args, stdin_str=stdin_str)
+    except OSError:
+        pass
 def getVersion(package, ref):

Note: See TracChangeset for help on using the changeset viewer.