diff options
author | Ben Howard <ben.howard@canonical.com> | 2014-01-09 08:17:41 -0700 |
---|---|---|
committer | Ben Howard <ben.howard@canonical.com> | 2014-01-09 08:17:41 -0700 |
commit | db215c30e7d7e9f9a9ffbe037beb6c92a2312b23 (patch) | |
tree | 884f06f8460f046ce8deadc8a09409e2d6dcf794 /cloudinit/util.py | |
parent | a5727fe1477c9cc4288d1ac41f70bd1ab7d7928a (diff) | |
parent | 3a4bf799ca2dd785fe1a5a35f188aed4f54ab5e5 (diff) | |
download | vyos-cloud-init-db215c30e7d7e9f9a9ffbe037beb6c92a2312b23.tar.gz vyos-cloud-init-db215c30e7d7e9f9a9ffbe037beb6c92a2312b23.zip |
Merge with upstream sources
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r-- | cloudinit/util.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index b69e2bb0..6b30af5e 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?? |