commit 3864b64edf3406d1221ff308cc80fbd7330b9b14 Author: Damian Johnson atagar@torproject.org Date: Sun Sep 8 14:27:52 2013 -0700
Don't crash when 'man tor' is unavailable
Oops, forgot to suppress exceptions here...
Traceback (most recent call last): File "runner.py", line 3, in <module> arm.starter.main() File "/home/atagar/Desktop/arm/arm/starter.py", line 505, in main _loadConfigurationDescriptions(pathPrefix) File "/home/atagar/Desktop/arm/arm/starter.py", line 211, in _loadConfigurationDescriptions arm.util.torConfig.loadOptionDescriptions() File "/home/atagar/Desktop/arm/arm/util/torConfig.py", line 179, in loadOptionDescriptions manCallResults = system.call("man tor") File "/usr/lib/python2.7/stem/util/system.py", line 860, in call raise exc OSError: man tor returned exit status 16 --- arm/util/torConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arm/util/torConfig.py b/arm/util/torConfig.py index b9992ae..b7289ad 100644 --- a/arm/util/torConfig.py +++ b/arm/util/torConfig.py @@ -176,7 +176,7 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): CONFIG_DESCRIPTIONS.clear() raise IOError("input file format is invalid") else: - manCallResults = system.call("man tor") + manCallResults = system.call("man tor", None)
if not manCallResults: raise IOError("man page not found")