From 66ed882dc3cf24395386869ea3c1d54e8f22c38b Mon Sep 17 00:00:00 2001 From: James Slagle Date: Fri, 13 Dec 2013 10:40:51 -0500 Subject: Cast file path to string. Before passing a path into selinux.matchpathcon, it needs to be casted to a string, since the path could be unicode and selinux.matchpathcon does not support unicode. Closes-Bug: #1260072 LP: #1260072 --- cloudinit/util.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloudinit/util.py b/cloudinit/util.py index a8ddb390..a37172dc 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -170,6 +170,8 @@ class SeLinuxGuard(object): def __exit__(self, excp_type, excp_value, excp_traceback): if self.selinux and self.selinux.is_selinux_enabled(): path = os.path.realpath(os.path.expanduser(self.path)) + # path should be a string, not unicode + path = str(path) do_restore = False try: # See if even worth restoring?? -- cgit v1.2.3