x/cloud-init
Code Issues Proposed changes

use hashlib rather than md5 module to avoid deprecation warning.

Browse Source 
Thanks: Garrett Holmstrom
This commit is contained in:
Scott Moser 2011-10-31 11:48:50 -04:00
parent b6b4f87ba7
commit 31ec05f35a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
- add sample systemd config files [Garrett Holmstrom] - add sample systemd config files [Garrett Holmstrom]
- add Fedora support [Garrent Holstrom] (LP: #883286) - add Fedora support [Garrent Holstrom] (LP: #883286)
- fix bug in netinfo.debug_info if no net devices available (LP: #883367) - fix bug in netinfo.debug_info if no net devices available (LP: #883367)
- use python module hashlib rather than md5 to avoid deprecation warnings.
0.6.2: 0.6.2:
- fix bug where update was not done unless update was explicitly set. - fix bug where update was not done unless update was explicitly set.
It would not be run if 'upgrade' or packages were set to be installed It would not be run if 'upgrade' or packages were set to be installed

4
cloudinit/UserDataHandler.py
View File

@ -24,7 +24,7 @@ from email import encoders
import yaml import yaml
import cloudinit import cloudinit
import cloudinit.util as util import cloudinit.util as util
import md5 import hashlib
starts_with_mappings={ starts_with_mappings={
'#include' : 'text/x-include-url', '#include' : 'text/x-include-url',
@ -66,7 +66,7 @@ def do_include(str,parts):
if line.startswith("#"): continue if line.startswith("#"): continue
# urls cannot not have leading or trailing white space # urls cannot not have leading or trailing white space
msum = md5.new() msum = hashlib.md5()
msum.update(line.strip()) msum.update(line.strip())
includeonce_filename = "%s/urlcache/%s" % ( includeonce_filename = "%s/urlcache/%s" % (
cloudinit.get_ipath_cur("data"), msum.hexdigest()) cloudinit.get_ipath_cur("data"), msum.hexdigest())