]> git.samba.org - ira/wip.git/commitdiff
autobuild: don't cleanup the pid file within the retry loop
authorAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 09:41:06 +0000 (20:41 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 09:56:38 +0000 (20:56 +1100)
if we rebase and retry we need to keep the pid file

script/autobuild.py

index 3fae59f25520b496386d0a1cfee0886600d28e38..357cb16b5bee53abab677649af1a63a6c8e3bc4e 100755 (executable)
@@ -278,7 +278,6 @@ def write_pidfile(fname):
     f = open(fname, mode='w')
     f.write("%u\n" % os.getpid())
     f.close()
-    cleanup_list.append(fname)
 
 
 def rebase_tree(url):
@@ -473,6 +472,8 @@ while True:
         cleanup()
         raise
 
+cleanup_list.append(gitroot + "/autobuild.pid")
+
 blist.kill_kids()
 if options.tail:
     print("waiting for tail to flush")