diff options
Diffstat (limited to 'ufo/gluster/swift/common/fs_utils.py')
-rw-r--r-- | ufo/gluster/swift/common/fs_utils.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ufo/gluster/swift/common/fs_utils.py b/ufo/gluster/swift/common/fs_utils.py index 7f5292c2bf1..88368c78c9e 100644 --- a/ufo/gluster/swift/common/fs_utils.py +++ b/ufo/gluster/swift/common/fs_utils.py @@ -101,7 +101,10 @@ def do_rmdir(path): logging.exception("Rmdir failed on %s err: %s", path, str(err)) if err.errno != errno.ENOENT: raise - return True + res = False + else: + res = True + return res def do_rename(old_path, new_path): try: @@ -149,8 +152,8 @@ def dir_empty(path): return True def rmdirs(path): - if os.path.isdir(path) and dir_empty(path): - do_rmdir(path) - else: - logging.error("rmdirs failed dir may not be empty or not valid dir") + if not os.path.isdir(path) or not dir_empty(path): + logging.error("rmdirs failed: %s may not be empty or not valid dir", path) return False + + return do_rmdir(path) |