bitten-slave: problem with AccountManagerPlugin

[A.Visser@…]

bitten-slave parses the output from Acount Manager? with the following regexp:

FORM_TOKEN_RE = re.compile('__FORM_TOKEN\" value=\"(.+)\"')

The order of the elements of the line containg FORM_TOKEN seems to be random on my system, e.g.

<value="8677a280e856107c273be316" input name="__FORM_TOKEN" type="hidden" /></div>

For this reason I either get the message "... does not support form authentication" or HTTP error 400 (for <input name="FORM_TOKEN" value="8677a280e856107c273be316" type="hidden")

Changing the expression to

('__FORM_TOKEN[^>]*value=\"([^"]+)\"|value=\"([^"]+)[^>]*__FORM_TOKEN')

seems to solve the problem, but there must exist a better regexp :-)

Regards, Anke