/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

  • Committer: Teddy Hogeborn
  • Date: 2016-10-30 03:02:49 UTC
  • Revision ID: teddy@recompile.se-20161030030249-4tcvjkfie8eye3n2
debian/control: Allow GnuPG 2 with the server.

debian/control (Package: mandos/Depends:): Change "gnupg" to "gnupg2 |
                                           gnupg".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2017 Teddy Hogeborn
15
 
# Copyright © 2008-2017 Björn Påhlsson
 
14
# Copyright © 2008-2016 Teddy Hogeborn
 
15
# Copyright © 2008-2016 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
114
114
if sys.version_info.major == 2:
115
115
    str = unicode
116
116
 
117
 
version = "1.7.15"
 
117
version = "1.7.13"
118
118
stored_state_file = "clients.pickle"
119
119
 
120
120
logger = logging.getLogger()
1460
1460
                         exc_info=error)
1461
1461
        return xmlstring
1462
1462
 
1463
 
 
1464
1463
try:
1465
1464
    dbus.OBJECT_MANAGER_IFACE
1466
1465
except AttributeError:
2883
2882
    # Convert the SafeConfigParser object to a dict
2884
2883
    server_settings = server_config.defaults()
2885
2884
    # Use the appropriate methods on the non-string config options
2886
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2887
 
                   "foreground", "zeroconf"):
 
2885
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2888
2886
        server_settings[option] = server_config.getboolean("DEFAULT",
2889
2887
                                                           option)
2890
2888
    if server_settings["port"]: