summaryrefslogtreecommitdiffstats
path: root/gluster/swift
diff options
context:
space:
mode:
authorLuis Pabon <lpabon@redhat.com>2013-07-09 15:41:43 -0400
committerPeter Portante <pportant@redhat.com>2013-07-09 18:20:05 -0700
commit3f72ae45a38b40dc0ff718e9cea91f18bb9bb7f0 (patch)
tree8f3f70dc72744b645cc5172f1f2de0c8bfd6797d /gluster/swift
parent9282f7095ed61d79d9232f7b2c6f7e838117beca (diff)
Remove do_mkdir and simplify mkdirs
Change-Id: I2e629533bceafb341ced5b1b3f2436448293e03f Signed-off-by: Luis Pabon <lpabon@redhat.com> Reviewed-on: http://review.gluster.org/5304 Reviewed-by: Peter Portante <pportant@redhat.com> Tested-by: Peter Portante <pportant@redhat.com>
Diffstat (limited to 'gluster/swift')
-rw-r--r--gluster/swift/common/fs_utils.py30
1 files changed, 8 insertions, 22 deletions
diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py
index 4de58e4..1f8415c 100644
--- a/gluster/swift/common/fs_utils.py
+++ b/gluster/swift/common/fs_utils.py
@@ -35,27 +35,6 @@ def do_write(fd, msg):
return cnt
-def do_mkdir(path):
- try:
- os.mkdir(path)
- except OSError as err:
- if err.errno != errno.EEXIST:
- logging.exception("Mkdir failed on %s err: %s", path, err.strerror)
- raise
- return True
-
-
-def do_makedirs(path):
- try:
- os.makedirs(path)
- except OSError as err:
- if err.errno != errno.EEXIST:
- logging.exception("Makedirs failed on %s err: %s",
- path, err.strerror)
- raise
- return True
-
-
def do_listdir(path):
try:
buf = os.listdir(path)
@@ -155,7 +134,14 @@ def mkdirs(path):
:param path: path to create
"""
if not os.path.isdir(path):
- do_makedirs(path)
+ try:
+ os.makedirs(path)
+ except OSError as err:
+ if err.errno != errno.EEXIST:
+ logging.exception("Makedirs failed on %s err: %s",
+ path, err.strerror)
+ raise
+ return True
def dir_empty(path):