Minor fix to untrace classes properly

mitotic · Oct 31, 2012 · 8ed96a3 · 8ed96a3
1 parent 4a8c0b8
commit 8ed96a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/otrace.py b/otrace.py
@@ -2740,7 +2740,7 @@ def cmd_untrace(self, cmd, comps, line, rem_line):
                 elif not isinstance(trace_value, basestring):
                     return (out_str, "Cannot untrace %s" % trace_value)
 
-                fullname = OTrace.remove_trace(trace_name, parent=parent_obj)
+                fullname = OTrace.remove_trace(trace_value, parent=parent_obj)
                 out_str = "untraced %s" % fullname
 
         return (out_str, err_str)
@@ -4128,7 +4128,7 @@ def remove_trace(cls, method=None, parent=None):
             if method == "*":
                 cls.trace_all = False
                 retvalue = "*"
-            elif method.startswith(PATH_SEP):
+            elif isinstance(method, basestring) and method.startswith(PATH_SEP):
                 # Untrace entity key
                 try:
                     del cls.trace_keys[method]