From 747bacbdc2ec3605b7d369c3a727976cf851f9d6 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Thu, 18 Oct 2012 09:58:51 -0500 Subject: fix lockfile imports for pyhton-daemon >= 1.6 --- src/lib/Bcfg2/Reporting/Collector.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py index 4bb088dde..df82248d0 100644 --- a/src/lib/Bcfg2/Reporting/Collector.py +++ b/src/lib/Bcfg2/Reporting/Collector.py @@ -7,7 +7,8 @@ import threading # pylint: disable=E0611 try: - from daemon.pidfile import PIDLockFile, PIDFileError + from lockfile.pidlockfile import PIDLockFile + from lockfile import Error as PIDFileError except ImportError: from daemon.pidlockfile import PIDLockFile, PIDFileError # pylint: enable=E0611 -- cgit v1.2.3-1-g7c22