[or-cvs] r19715: {torctl} Capture the entire OS string when parsing descriptors. (torctl/trunk/python/TorCtl)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-06-13 22:39:33 -0400 (Sat, 13 Jun 2009)
New Revision: 19715

Modified:
   torctl/trunk/python/TorCtl/TorCtl.py
Log:

Capture the entire OS string when parsing descriptors.



Modified: torctl/trunk/python/TorCtl/TorCtl.py
===================================================================
--- torctl/trunk/python/TorCtl/TorCtl.py	2009-06-13 20:57:16 UTC (rev 19714)
+++ torctl/trunk/python/TorCtl/TorCtl.py	2009-06-14 02:39:33 UTC (rev 19715)
@@ -333,7 +333,7 @@
     for line in desc:
       rt = re.search(r"^router (\S+) (\S+)", line)
       fp = re.search(r"^opt fingerprint (.+).*on (\S+)", line)
-      pl = re.search(r"^platform Tor (\S+).*on (\S+)", line)
+      pl = re.search(r"^platform Tor (\S+).*on ([\S\s]+)", line)
       ac = re.search(r"^accept (\S+):([^-]+)(?:-(\d+))?", line)
       rj = re.search(r"^reject (\S+):([^-]+)(?:-(\d+))?", line)
       bw = re.search(r"^bandwidth (\d+) \d+ (\d+)", line)