fixing this morning's mach OS X psutil bustage

If mach is broken in your mozilla-central clone on Mac OS X this morning:
08-23 10:20 > ./mach build
Error running mach:


The error occurred in code that was called by the mach command. This is either
a bug in the called code itself or in the way that mach is calling it.

You should consider filing a bug for this issue.

If filing a bug, please include the full output of mach, including this error

The details of the failure are as follows:

AttributeError: 'module' object has no attribute 'TCPS_ESTABLISHED'

  File "/Users/myk/Mozilla/central/python/mozbuild/mozbuild/mach_commands.py", line 293, in build
    from mozbuild.controller.building import BuildMonitor
  File "/Users/myk/Mozilla/central/python/mozbuild/mozbuild/controller/building.py", line 22, in <module>
    import psutil
  File "/Users/myk/Mozilla/central/python/psutil/psutil/__init__.py", line 95, in <module>
    import psutil._psosx as _psplatform
  File "/Users/myk/Mozilla/central/python/psutil/psutil/_psosx.py", line 48, in <module>

Then you've been bit by the fix for bug 908296. To resolve the bustage, run this command in your Hg clone:
hg status -in python/psutil | xargs rm

Or, if you've cloned the Git mirror, run this instead:
git clean -xf python/psutil

No comments: