From 207bf555ac0f472a4929e0e06bfdfe520fe0ddc2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 19 Nov 2012 15:49:00 -0500 Subject: BuiltinCore: fixed import of LockFailed --- src/lib/Bcfg2/Server/BuiltinCore.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/BuiltinCore.py') diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py index 0fe8f39da..4d7453840 100644 --- a/src/lib/Bcfg2/Server/BuiltinCore.py +++ b/src/lib/Bcfg2/Server/BuiltinCore.py @@ -9,11 +9,12 @@ from Bcfg2.Server.Core import BaseCore, NoExposedMethod from Bcfg2.Compat import xmlrpclib, urlparse from Bcfg2.SSLServer import XMLRPCServer +from lockfile import LockFailed # pylint: disable=E0611 try: - from daemon.pidfile import PIDLockFile, LockFailed + from daemon.pidfile import PIDLockFile except ImportError: - from daemon.pidlockfile import PIDLockFile, LockFailed + from daemon.pidlockfile import PIDLockFile # pylint: enable=E0611 -- cgit v1.2.3-1-g7c22