mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 930808 - Catch all exceptions when importing psutil; r=glandium
This is the same workaround applied in 7be399d00f9a (bug 908296). It should stop |make check| from complaining on OS X. --HG-- extra : rebase_source : 7cf18c8261d375437187a1c256b0b7f8ae0cbb30 extra : amend_source : 952eef1f385962005833c12f643ebb5ea02c93f3 extra : histedit_source : 285bda4330b2997afcc048ecc81f84173d422582
This commit is contained in:
parent
79da0af62d
commit
6644cc93eb
@ -35,7 +35,7 @@ from threading import (
|
||||
try:
|
||||
import psutil
|
||||
HAVE_PSUTIL = True
|
||||
except ImportError:
|
||||
except Exception:
|
||||
HAVE_PSUTIL = False
|
||||
|
||||
from automation import Automation
|
||||
|
Loading…
Reference in New Issue
Block a user