/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: 2010-10-13 06:12:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20101013061252-3a918xedja5caya8
* debian/mandos-client.lintian-overrides: Added plugins.d/plymouth.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
204
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
205
            logger.debug(u"Zeroconf service established.")
206
206
        elif state == avahi.ENTRY_GROUP_COLLISION:
207
 
            logger.info(u"Zeroconf service name collision.")
 
207
            logger.warning(u"Zeroconf service name collision.")
208
208
            self.rename()
209
209
        elif state == avahi.ENTRY_GROUP_FAILURE:
210
210
            logger.critical(u"Avahi: Error in group state changed %s",
1408
1408
 
1409
1409
    def add_pipe(self, parent_pipe):
1410
1410
        """Dummy function; override as necessary"""
1411
 
        raise NotImplementedError
 
1411
        pass
1412
1412
 
1413
1413
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1414
                     socketserver.TCPServer, object):
1613
1613
            else:
1614
1614
                raise ValueError(u"Unknown suffix %r" % suffix)
1615
1615
        except (ValueError, IndexError), e:
1616
 
            raise ValueError(*(e.args))
 
1616
            raise ValueError(e.message)
1617
1617
        timevalue += delta
1618
1618
    return timevalue
1619
1619