diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-22 16:53:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-22 16:53:11 +0000 |
| commit | be56fd77ad9cfc221a1fea9e0380cb3a44181bee (patch) | |
| tree | 1b2097aa82ced33e5401556d90de276eaadb4892 | |
| parent | 861c0d9e214aed8ba6633aff56270d05fa69e640 (diff) | |
| parent | 1fc7c0c534b6b03feaf9be3d7aa0f5b3e4f42a9d (diff) | |
Merge "Clarify use of Use of deprecated md5 library"
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 1 | ||||
| -rwxr-xr-x | run_tests.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index 134840335..a0f263403 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 179164510..1d6f3a4db 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 { |