/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2014-07-24 01:35:55 UTC
  • Revision ID: teddy@recompile.se-20140724013555-zrgds2ft5cmwhugb
Fix two mutually cancelling bugs.

* mandos (rfc3339_duration_to_delta): Set "token_duration" to be a
                                      token (and not a tuple) by
                                      removing the final comma.
                                      Construct the needed tuple later
                                      when initializing the
                                      "followers" variable.
* mandos-ctl (rfc3339_duration_to_delta): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
157
157
    token_duration = Token(re.compile(r"P"), None,
158
158
                           frozenset((token_year, token_month,
159
159
                                      token_day, token_time,
160
 
                                      token_week))),
 
160
                                      token_week)))
161
161
    # Define starting values
162
162
    value = datetime.timedelta() # Value so far
163
163
    found_token = None
164
 
    followers = frozenset(token_duration,) # Following valid tokens
 
164
    followers = frozenset((token_duration,)) # Following valid tokens
165
165
    s = duration                # String left to parse
166
166
    # Loop until end token is found
167
167
    while found_token is not token_end: