/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: 2012-06-17 22:58:07 UTC
  • mfrom: (237.4.33 release)
  • Revision ID: teddy@recompile.se-20120617225807-6o4z294a5fxfvlyf
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
28
 
 
29
from future_builtins import *
 
30
 
29
31
import sys
30
32
import dbus
31
33
import argparse
61
63
server_path = "/"
62
64
server_interface = domain + ".Mandos"
63
65
client_interface = domain + ".Mandos.Client"
64
 
version = "1.5.3"
 
66
version = "1.6.0"
65
67
 
66
68
def timedelta_to_milliseconds(td):
67
69
    """Convert a datetime.timedelta object to milliseconds"""