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

[invirt/packages/invirt-dev.git] / invirtibuilder

diff --git a/invirtibuilder b/invirtibuilder
index 15b4e05..f5c3821 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -137,7 +137,7 @@ def tagSubmodule(pocket, package, ref, principal):
     I'm sure that long description gives you great confidence in the
     legitimacy of my reasoning.
     """
     I'm sure that long description gives you great confidence in the
     legitimacy of my reasoning.
     """

-    if config.build.pockets[pocket].get('allow_backtracking', False):
+    if not config.build.pockets[pocket].get('allow_backtracking', False):

         env = dict(os.environ)
         branch = b.pocketToGit(pocket)
         version = b.getVersion(package, ref)
         env = dict(os.environ)
         branch = b.pocketToGit(pocket)
         version = b.getVersion(package, ref)

@@ -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)