Regardless of any success or failure, always remove the build queue

entry when handling a build has completed.

svn path=/trunk/packages/invirt-dev/; revision=2838

diff --git a/invirtibuilder b/invirtibuilder
index 633563c..f5c3821 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -335,10 +335,6 @@ def build():
                     uploadBuild(pocket, workdir)
 
                     db.failed_stage = 'cleaning up'
                     uploadBuild(pocket, workdir)
 
                     db.failed_stage = 'cleaning up'

-
-                # Finally, now that everything is done, remove the
-                # build queue item
-                os.unlink(os.path.join(b._QUEUE_DIR, build))

         except:
             db.traceback = traceback.format_exc()
         else:
         except:
             db.traceback = traceback.format_exc()
         else:

@@ -348,6 +344,10 @@ def build():
             database.session.save_or_update(db)
             database.session.commit()
 
             database.session.save_or_update(db)
             database.session.commit()
 

+            # Finally, now that everything is done, remove the
+            # build queue item
+            os.unlink(os.path.join(b._QUEUE_DIR, build))
+

             reportBuild(db)
 
 
             reportBuild(db)