diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-10-18 09:03:33 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-10-18 09:03:33 -0500 |
| commit | 797bef4955f03224681683836e3147bab4e90a8e (patch) | |
| tree | fcfc917c976e700a652d86d63c815948130d0bb4 /src/lib/Bcfg2/Reporting/Collector.py | |
| parent | fc6b73fc4f30f6f5b9e89a8fec3627b84e4ebbaa (diff) | |
| download | bcfg2-797bef4955f03224681683836e3147bab4e90a8e.tar.gz bcfg2-797bef4955f03224681683836e3147bab4e90a8e.tar.bz2 bcfg2-797bef4955f03224681683836e3147bab4e90a8e.zip | |
ty daemon.pidlock before pidlockfile
Diffstat (limited to 'src/lib/Bcfg2/Reporting/Collector.py')
| -rw-r--r-- | src/lib/Bcfg2/Reporting/Collector.py | 8 |
1 files changed, 7 insertions, 1 deletions
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, \ |