fs: don't call makedirs() if the dirs already exist

xapi-project · May 30, 2012 · d661edc · d661edc
1 parent 5c5d254
commit d661edc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/python/util.py b/python/util.py
@@ -224,14 +224,3 @@ def ismount(path):
     if ino1 == ino2:
         return True     # path/.. is the same i-node as path
     return False
-
-def makedirs(name, mode=0777):
-    head, tail = os.path.split(name)
-    if not tail:
-        head, tail = os.path.split(head)
-    if head and tail and not pathexists(head):
-        makedirs(head, mode)
-        if tail == os.curdir:
-            return
-    os.mkdir(name, mode)
-
diff --git a/python/xcp.py b/python/xcp.py
@@ -109,7 +109,9 @@ def __init__(self, addr, requestHandler=RequestHandler):
         self.logRequests = 0
         if os.path.exists(addr):
             os.unlink(addr)
-        os.makedirs(os.path.dirname(addr))
+        dir = os.path.dirname(addr)
+        if not(os.path.exists(dir)):
+            os.makedirs(dir)
         SimpleXMLRPCDispatcher.__init__(self)
         UnixStreamServer.__init__(self, addr, requestHandler)