/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: 2011-10-10 20:30:55 UTC
  • mfrom: (505.1.13 teddy)
  • Revision ID: teddy@recompile.se-20111010203055-a4crqy7gw2ln252r
Miscellaneous fixes prompted by lintian:

* debian/control (Conflicts): Changed to "Breaks:".
* debian/copyright: Updated format.
* debian/mandos-client.postinst: Use "set -e" instead of "#!/bin/sh -e".
* debian/mandos-client.postrm: - '' -
* debian/mandos.postinst: - '' -
* debian/mandos.prerm: Consistent magic.
* mandos: Small comment change.
* mandos-clients.conf.xml (OPTIONS/extended_timeout): Fix spelling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1428
1428
                    sent_size += sent
1429
1429
                
1430
1430
                logger.info("Sending secret to %s", client.name)
1431
 
                # bump the timeout as if seen
 
1431
                # bump the timeout using extended_timeout
1432
1432
                client.checked_ok(client.extended_timeout)
1433
1433
                if self.server.use_dbus:
1434
1434
                    # Emit D-Bus signal
1661
1661
                                       for cond, name in
1662
1662
                                       condition_names.iteritems()
1663
1663
                                       if cond & condition)
1664
 
        # error or the other end of multiprocessing.Pipe has closed
 
1664
        # error, or the other end of multiprocessing.Pipe has closed
1665
1665
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1666
            # Wait for other process to exit
1666
1667
            proc.join()
1667
1668
            return False
1668
1669