p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

catching KeyboardInterrupt correctly such that it doesn't keep building #1770

This commit is contained in:
Tully Foote 2009-10-02 00:40:42 +00:00
parent f2a9efa280
commit 05508d1f67
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/rosmake
View File

@ -114,10 +114,14 @@ class CompileThread(threading.Thread):
self.rosmakeall.print_all("<<< %s <<< %s"%(pkg, result_string), thread_name= self.name)
if result or self.rosmakeall.robust_build:
self.build_queue.return_built(pkg)
if result_string.find("[Interrupted]") != -1:
self.rosmakeall.print_all("Caught Interruption", thread_name=self.name)
self.build_queue.stop()
break # unnecessary since build_queue is done now while will quit
else:
self.rosmakeall.print_all("Halting due to failure in package %s.\n[ rosmake ] Re-run with -r to ignore failures and keep building."%pkg)
self.build_queue.stop()
break # unnecessary since build_queue is done now
break # unnecessary since build_queue is done now, while will quit
class BuildQueue:
def __init__(self, package_list, dependency_tracker):
@ -166,6 +170,8 @@ class BuildQueue:
self.condition.wait() # failed to find a package wait for a notify before looping
if self.is_done():
break
self.condition.release()
return (None, None, None)
@ -323,7 +329,7 @@ class RosMakeAll:
if no_target:
return_string = ( "[SKIP] No rule to make target %s"%( argument))
elif interrupt:
return_string = (" [Interrupted]" )
return_string = ("[Interrupted]" )
else:
return_string = ( "[FAIL] [ %.2f seconds ]"%( self.profile[argument][p]))
self.result[argument][p] = no_target