From 5b20cec19fa61213fe0ed6aded53fb3603f36046 Mon Sep 17 00:00:00 2001
From: Alexander Lenz <alexander.lenz@frm2.tum.de>
Date: Tue, 1 Aug 2017 13:51:22 +0200
Subject: [PATCH] secop-server: import compability for daemon pkgs.

Change-Id: I3884cbe4285fae5faa47633b89e92e64ae83ba16
---
 secop/server.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/secop/server.py b/secop/server.py
index 55dfd58..5db3c0f 100644
--- a/secop/server.py
+++ b/secop/server.py
@@ -29,7 +29,11 @@ import threading
 import ConfigParser
 
 from daemon import DaemonContext
-from daemon.pidfile import TimeoutPIDLockFile
+
+try:
+    import daemon.pidlockfile as pidlockfile
+except ImportError:
+    import daemon.pidfile as pidlockfile
 
 from secop.lib import get_class, formatException
 from secop.protocol.dispatcher import Dispatcher
@@ -57,7 +61,7 @@ class Server(object):
         piddir = os.path.dirname(self._pidfile)
         if not os.path.isdir(piddir):
             os.makedirs(piddir)
-        pidfile = TimeoutPIDLockFile(self._pidfile)
+        pidfile = pidlockfile.TimeoutPIDLockFile(self._pidfile)
 
         if pidfile.is_locked():
             self.log.error('Pidfile already exists. Exiting')