Page MenuHomePhabricator

procutil: make recent fix for zombies compatible with py2
ClosedPublic

Authored by martinvonz on Thu, Jun 25, 3:13 AM.

Details

Summary

The fix in ed684a82e29b (procutil: always waiting on child processes
to prevent zombies with 'hg serve', 2020-05-07) works only on Python 3
because it passes a daemon argument to threading.Thread(). Python
2 requires you to assign to the .daemon property instead. Python 3
also seems to support that, so this patch fixes the code by
unconditionally using the old form.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Thu, Jun 25, 3:13 AM

Reminder that this is intended for stable (since that's where the py3-only fix is)

pulkit accepted this revision.Thu, Jun 25, 10:52 AM
This revision is now accepted and ready to land.Thu, Jun 25, 10:52 AM