/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: 2014-02-16 13:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 656.
  • Revision ID: teddy@recompile.se-20140216131220-4nv9kjolkrxvn6l3
Tags: version-1.6.4-1
* Makefile (version): Changed to "1.6.4".
* NEWS (Version 1.6.4): New entry.
* debian/changelog (1.6.4-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1352
1352
                                       *args, **kwargs)
1353
1353
    
1354
1354
    def start_checker(self, *args, **kwargs):
1355
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1355
        old_checker = self.checker
 
1356
        if self.checker is not None:
 
1357
            old_checker_pid = self.checker.pid
 
1358
        else:
 
1359
            old_checker_pid = None
1356
1360
        r = Client.start_checker(self, *args, **kwargs)
1357
1361
        # Only if new checker process was started
1358
1362
        if (self.checker is not None