diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-10-18 09:58:51 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-10-18 09:58:51 -0500 |
| commit | 747bacbdc2ec3605b7d369c3a727976cf851f9d6 (patch) | |
| tree | 5059c957225729f7257adb6b83fde6fbcecf8b4b | |
| parent | 721c3638d6a60531f152cd48d255b8c1ae0044cf (diff) | |
| download | bcfg2-747bacbdc2ec3605b7d369c3a727976cf851f9d6.tar.gz bcfg2-747bacbdc2ec3605b7d369c3a727976cf851f9d6.tar.bz2 bcfg2-747bacbdc2ec3605b7d369c3a727976cf851f9d6.zip | |
fix lockfile imports for pyhton-daemon >= 1.6
| -rw-r--r-- | src/lib/Bcfg2/Reporting/Collector.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |