/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: 2013-10-05 19:34:40 UTC
  • Revision ID: teddy@recompile.se-20131005193440-ldh85msvzxzmwhgr
* debian/control (Build-Depends): Depend on debhelper 8.9.7 for using
  "override-*-arch" and "override-*-indep" targets in debian/rules.
* debian/rules: Completely rewritten to use features from debhelper v7.
* plugins.d/mandos-client.c (fprintf_plus): Cast return value to
  return type; this fixes a warning since TEMP_FAILURE_RETRY seems to
  return a long int, not whatever type its inner expresson returns.
* plugins.d/password-prompt.c (fprintf_plus): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
199
199
    >>> string_to_delta("5m 30s")
200
200
    datetime.timedelta(0, 330)
201
201
    """
202
 
    value = datetime.timedelta(0)
203
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
204
202
    
205
203
    try:
206
204
        return rfc3339_duration_to_delta(interval)
207
205
    except ValueError:
208
206
        pass
209
207
    
 
208
    value = datetime.timedelta(0)
 
209
    regexp = re.compile(r"(\d+)([dsmhw]?)")
 
210
    
210
211
    for num, suffix in regexp.findall(interval):
211
212
        if suffix == "d":
212
213
            value += datetime.timedelta(int(num))