Pilot: After checking for new commits, switch back to old branch

skyjake · Jun 7, 2015 · 39e4ce2 · 39e4ce2
1 parent 40d80c7
commit 39e4ce2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/distrib/pilot.py b/distrib/pilot.py
@@ -373,13 +373,17 @@ def doTask(task):
 
     elif task.startswith('check_'):
         if pilotcfg.ID == 'master':
+            oldBranch = currentBranch()
             branch = task[6:]
             msg("CHECK BRANCH: " + branch)
             autobuild('pull')
             if switchToBranch(branch):
                 autobuild('pull')
             if checkBranchHeadForChanges():
                 newTask('buildfrom_' + branch, allClients=True)
+            else:
+                switchToBranch(oldBranch)
+                autobuild('pull')
         return True
 
     elif task == 'tag_build':