commit a2595d9720a67cbd12b22bbcd15c3fe3f778f230 Author: Damian Johnson atagar@torproject.org Date: Mon May 27 20:11:59 2013 -0700
Accounting for stem's discontinued use of meets_requirements()
Stem removed the meets_requirements() method prior to its initial release...
Traceback (most recent call last): File "./src/starter.py", line 478, in <module> cli.controller.startTorMonitor(time.time() - initTime) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 564, in startTorMonitor curses.wrapper(drawTorMonitor, startTime) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 618, in drawTorMonitor control.redraw(False) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 346, in redraw panelImpl.redraw(force) File "/home/atagar/Desktop/arm/src/util/panel.py", line 405, in redraw self.draw(self.maxX, self.maxY) File "/home/atagar/Desktop/arm/src/cli/torrcPanel.py", line 178, in draw corrections = dict((lineNum, (issue, msg)) for lineNum, issue, msg in loadedTorrc.getCorrections()) File "/home/atagar/Desktop/arm/src/util/torConfig.py", line 797, in getCorrections skipValidation |= (torVersion is None or not torVersion.meets_requirements(stem.version.Requirement.GETINFO_CONFIG_TEXT)) AttributeError: 'Version' object has no attribute 'meets_requirements' --- src/util/torConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/torConfig.py b/src/util/torConfig.py index a26cced..52caae6 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -794,7 +794,7 @@ class Torrc(): else: torVersion = torTools.getConn().getVersion() skipValidation = not CONFIG["features.torrc.validate"] - skipValidation |= (torVersion is None or not torVersion.meets_requirements(stem.version.Requirement.GETINFO_CONFIG_TEXT)) + skipValidation |= (torVersion is None or not torVersion >= stem.version.Requirement.GETINFO_CONFIG_TEXT)
if skipValidation: log.info("Skipping torrc validation (requires tor 0.2.2.7-alpha)")