script/autobuild.py: cleanup on rebase failure

[ira/wip.git] / script / autobuild.py

diff --git a/script/autobuild.py b/script/autobuild.py
index abca8e80c0bc71ca902c8718a1b789b63c37386e..d6ad082510e728062a443220d34c953569e1aab0 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -504,6 +504,8 @@ while True:
             elif options.rebase_master:
                 rebase_tree(samba_master)
         except:
             elif options.rebase_master:
                 rebase_tree(samba_master)
         except:

+            cleanup_list.append(gitroot + "/autobuild.pid")
+            cleanup()

             email_failure(-1, 'rebase', 'rebase', 'rebase', 'rebase on master failed')
             sys.exit(1)
         blist = buildlist(tasks, args)
             email_failure(-1, 'rebase', 'rebase', 'rebase', 'rebase on master failed')
             sys.exit(1)
         blist = buildlist(tasks, args)