diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index 134840335a..a0f263403e 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -26,6 +26,7 @@ try: import json except ImportError: import simplejson as json +# NOTE: XenServer 6 and below use python 2.4 so md5 is needed and not hashlib import md5 import os import os.path diff --git a/run_tests.sh b/run_tests.sh index 1791645102..1d6f3a4dbd 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -102,7 +102,7 @@ xen_net_path="plugins/xenserver/networking/etc/xensource/scripts" srcfiles=`find nova -type f -name "*.py"` srcfiles+=" `find bin -type f ! -name "nova.conf*" ! -name "*api-paste.ini*"`" srcfiles+=" `find tools -type f -name "*.py"`" -srcfiles+=" `find ${xen_api_path} ${xen_net_path} -type f ! -name "*.patch"`" +srcfiles+=" `find ${xen_api_path} ${xen_net_path} -type f ! -name "*.patch" ! -name "*.pyc"`" srcfiles+=" setup.py" function run_pep8 {