cloud-init

Merge lp:~james-slagle/cloud-init/lp-1260072 into lp:~cloud-init-dev/cloud-init/trunk

  1. lp-1260072
  2. Merge into trunk
Proposed by James Slagle
Status: Merged
Merged at revision: 903
Proposed branch: lp:~james-slagle/cloud-init/lp-1260072
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
cloudinit/util.py (+2/-0)
To merge this branch: bzr merge lp:~james-slagle/cloud-init/lp-1260072
Reviewer Review Type Date Requested Status
Joshua Harlow (community) Approve
Review via email: mp+198964@code.launchpad.net

Description of the change

Proposed patch for https://bugs.launchpad.net/cloud-init/+bug/1260072

To post a comment you must log in.
Revision history for this message
Joshua Harlow (harlowja) wrote :

Seems good to me, thx james!

Revision history for this message
Joshua Harlow (harlowja) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/util.py'
2--- cloudinit/util.py 2013-11-14 03:28:52 +0000
3+++ cloudinit/util.py 2013-12-13 15:50:35 +0000
4@@ -170,6 +170,8 @@
5 def __exit__(self, excp_type, excp_value, excp_traceback):
6 if self.selinux and self.selinux.is_selinux_enabled():
7 path = os.path.realpath(os.path.expanduser(self.path))
8+ # path should be a string, not unicode
9+ path = str(path)
10 do_restore = False
11 try:
12 # See if even worth restoring??