Make munkicommon.stopRequested() work in all run modes

This commit is contained in:
Greg Neagle
2016-12-15 08:40:35 -08:00
parent f46c04307f
commit dcedb3a418
2 changed files with 12 additions and 13 deletions

View File

@@ -699,12 +699,12 @@ def main():
if munkicommon.stopRequested():
break
time.sleep(0.5)
# tell status app we're done sending status
munkistatus.quit()
else:
msg = 'Another instance of %s is running. Exiting.' % myname
munkicommon.log(msg)
print >> sys.stderr, msg
# tell status app we're done sending status
munkistatus.quit()
munkicommon.cleanUpTmpDir()
exit(0)