From 797bef4955f03224681683836e3147bab4e90a8e Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Thu, 18 Oct 2012 09:03:33 -0500
Subject: ty daemon.pidlock before pidlockfile

---
 src/lib/Bcfg2/Reporting/Collector.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py
index 2214e775f..4bb088dde 100644
--- a/src/lib/Bcfg2/Reporting/Collector.py
+++ b/src/lib/Bcfg2/Reporting/Collector.py
@@ -4,7 +4,13 @@ import logging
 import time
 import traceback
 import threading
-from daemon.pidlockfile import PIDLockFile, PIDFileError
+
+# pylint: disable=E0611
+try:
+    from daemon.pidfile import PIDLockFile, PIDFileError
+except ImportError:
+    from daemon.pidlockfile import PIDLockFile, PIDFileError
+# pylint: enable=E0611
 
 import Bcfg2.Logger
 from Bcfg2.Reporting.Transport import load_transport_from_config, \
-- 
cgit v1.2.3-1-g7c22