NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't reinvent (poorly) gconf.escape_key and friends. (Mark McLoughlin)

Browse Source 
Was causing errors with storing per-connection preferences for remote
URIs with '+' in them.
This commit is contained in:
Cole Robinson 2009-07-01 14:51:41 -04:00
parent 97f6cd8fdb
commit c0c3cf0d1a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/virtManager/config.py
View File

@ -116,7 +116,7 @@ class vmmConfig:
# Per-VM/Connection/Connection Host Option dealings # Per-VM/Connection/Connection Host Option dealings
def _perconn_helper(self, uri, pref_func, func_type, value=None): def _perconn_helper(self, uri, pref_func, func_type, value=None):
suffix = "connection_prefs/%s" % uri.replace("/", "-") suffix = "connection_prefs/%s" % gconf.escape_key(uri, len(uri))
return self._perobj_helper(suffix, pref_func, func_type, value) return self._perobj_helper(suffix, pref_func, func_type, value)
def _perhost_helper(self, uri, pref_func, func_type, value=None): def _perhost_helper(self, uri, pref_func, func_type, value=None):
host = virtinst.util.get_uri_hostname(uri) host = virtinst.util.get_uri_hostname(uri)
@ -125,8 +125,8 @@ class vmmConfig:
suffix = "connection_prefs/hosts/%s" % host suffix = "connection_prefs/hosts/%s" % host
return self._perobj_helper(suffix, pref_func, func_type, value) return self._perobj_helper(suffix, pref_func, func_type, value)
def _pervm_helper(self, uri, uuid, pref_func, func_type, value=None): def _pervm_helper(self, uri, uuid, pref_func, func_type, value=None):
suffix = "connection_prefs/%s/vms/%s" % (uri.replace("/", "-"), suffix = ("connection_prefs/%s/vms/%s" %
uuid) (gconf.escape_key(uri, len(uri)), uuid))
return self._perobj_helper(suffix, pref_func, func_type, value) return self._perobj_helper(suffix, pref_func, func_type, value)
def _perobj_helper(self, suffix, pref_func, func_type, value=None): def _perobj_helper(self, suffix, pref_func, func_type, value=None):
@ -206,7 +206,7 @@ class vmmConfig:
""" """
Remove any old VM preference entries for the passed URI Remove any old VM preference entries for the passed URI
""" """
uri = uri.replace("/", "-") uri = gconf.escape_key(uri, len(uri))
key = self.conf_dir + "/connection_prefs/%s/vms" % uri key = self.conf_dir + "/connection_prefs/%s/vms" % uri
kill_vms = [] kill_vms = []
gconf_vms = map(lambda inp: inp.split("/")[-1], gconf_vms = map(lambda inp: inp.split("/")[-1],