From 3f72ae45a38b40dc0ff718e9cea91f18bb9bb7f0 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Tue, 9 Jul 2013 15:41:43 -0400 Subject: Remove do_mkdir and simplify mkdirs Change-Id: I2e629533bceafb341ced5b1b3f2436448293e03f Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/5304 Reviewed-by: Peter Portante Tested-by: Peter Portante --- gluster/swift/common/fs_utils.py | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'gluster') 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): -- cgit