X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/66f2a7f0bd561c11302e9998caed0b34a4cbf4bb..281e0d0a1d636078a9a48395c753d5a10d78b63a:/invirt-submit-build?ds=sidebyside

diff --git a/invirt-submit-build b/invirt-submit-build
index caa949f..f202c3d 100755
--- a/invirt-submit-build
+++ b/invirt-submit-build
@@ -18,16 +18,24 @@ keeping.
 
 
 import datetime
+import optparse
 import os
 import sys
 import tempfile
 import uuid
 
+from invirt.config import structs as config
+import invirt.common as c
 import invirt.builder as b
 
 
 def main():
-    pocket, package, commit = sys.argv[1:4]
+    parser = optparse.OptionParser('Usage: %prog pocket package commit')
+    opts, args = parser.parse_args()
+    if len(args) != 3:
+        parser.print_help()
+        return 1
+    pocket, package, commit = args
     principal = os.environ['REMOTE_USER']
     request_time = datetime.datetime.utcnow()
     q_path = os.path.join(b._QUEUE_DIR,
@@ -35,17 +43,31 @@ def main():
                                      uuid.uuid4()))
 
     try:
-        validateBuild(pocket, package, commit)
+        # TODO: clean up this interface.
+        b.ensureValidPackage(package)
+        if config.build.get('mirror'):
+            c.captureOutput(['git', 'fetch'], cwd=b.getRepo(package))
+        commit = b.canonicalize_commit(package, commit)
+        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)
 
     # To keep from triggering the Invirtibuilder before we've actually
     # written the file out, first write the queue entry to a temporary
     # file, and then move it into the queue directory.
-    q = tempfile.NamedTemporaryFile(delete=False)
+    q_fd, q_name = tempfile.mkstemp()
+    q = os.fdopen(q_fd, 'r+')
     print >>q, "%s %s %s %s" % (pocket, package, commit, principal)
-    os.rename(q.name, q_path)
+    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)
 
 
 if __name__ == '__main__':