[or-cvs] r10875: Fix to parse svn Tor versions. Or at least not break on them (torflow/trunk/TorCtl)

[mikeperry at seul.org]

Author: mikeperry
Date: 2007-07-19 01:34:24 -0400 (Thu, 19 Jul 2007)
New Revision: 10875

Modified:
   torflow/trunk/TorCtl/TorCtl.py
Log:

Fix to parse svn Tor versions. Or at least not break on them.



Modified: torflow/trunk/TorCtl/TorCtl.py
===================================================================
--- torflow/trunk/TorCtl/TorCtl.py	2007-07-18 20:46:14 UTC (rev 10874)
+++ torflow/trunk/TorCtl/TorCtl.py	2007-07-19 05:34:24 UTC (rev 10875)
@@ -535,7 +535,7 @@
     # Use http://docs.python.org/lib/profile.html to verify this is 
     # the part of startup that is slow
     for line in desc:
-      pl = re.search(r"^platform Tor (\S+) on (\S+)", line)
+      pl = re.search(r"^platform Tor (\S+).*on (\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)