diff options
Diffstat (limited to 'src/lib/Server')
| -rwxr-xr-x | src/lib/Server/Admin/Reports.py | 5 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Packages.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py index d11451852..91d25a0b0 100755 --- a/src/lib/Server/Admin/Reports.py +++ b/src/lib/Server/Admin/Reports.py @@ -12,9 +12,10 @@ from Bcfg2.Server.Reports.updatefix import update_database from Bcfg2.Server.Reports.utils import * from lxml.etree import XML, XMLSyntaxError -try: +# FIXME: Remove when server python dep is 2.5 or greater +if sys.version_info >= (2, 5):: from hashlib import md5 -except ImportError: +else: from md5 import md5 # Load django diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index d2517590c..61d6e1778 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -6,11 +6,13 @@ import logging import lxml.etree import os import re +import sys import urllib2 -try: +# FIXME: Remove when server python dep is 2.5 or greater +if sys.version_info >= (2, 5):: from hashlib import md5 -except ImportError: +else: from md5 import md5 import Bcfg2.Logger |