From 1fc7c0c534b6b03feaf9be3d7aa0f5b3e4f42a9d Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Mon, 20 Feb 2012 22:38:52 -0800 Subject: [PATCH] Clarify use of Use of deprecated md5 library See Invalid bug 937463 for more details Also change run_tests.sh to ignore more '*.pyc' files Change-Id: I8c8ded902833fe4268966ff7a9630daaaad43a19 --- plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 1 + run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index 134840335abf..a0f263403e52 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 179164510222..1d6f3a4dbd97 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 {