diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-19 15:49:00 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-19 15:49:00 -0500 |
| commit | 207bf555ac0f472a4929e0e06bfdfe520fe0ddc2 (patch) | |
| tree | 11cc852cdfa8a8a4fe629d90630ce589900d4a79 /src/lib/Bcfg2/Server/BuiltinCore.py | |
| parent | d6fdeb6f1feda9d46f60302109186f37092a26e5 (diff) | |
| download | bcfg2-207bf555ac0f472a4929e0e06bfdfe520fe0ddc2.tar.gz bcfg2-207bf555ac0f472a4929e0e06bfdfe520fe0ddc2.tar.bz2 bcfg2-207bf555ac0f472a4929e0e06bfdfe520fe0ddc2.zip | |
BuiltinCore: fixed import of LockFailed
Diffstat (limited to 'src/lib/Bcfg2/Server/BuiltinCore.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/BuiltinCore.py | 5 |
1 files changed, 3 insertions, 2 deletions
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 |