diff options
author | Bala.FA <bala@gluster.com> | 2011-09-22 10:46:30 +0530 |
---|---|---|
committer | Tim <timothyasir@gluster.com> | 2011-09-23 13:58:02 +0530 |
commit | 294faf0aed7f3f1dee26b13c144ba983f799cc87 (patch) | |
tree | 17c8685a4db97f51482238722503125d07324172 /src/com.gluster.storage.management.gateway.scripts/src/backend | |
parent | d664fbdf251e40f7e7baaac5181037c5490bd736 (diff) |
Cleanup in clear_volume_directory.py
Signed-off-by: Bala.FA <bala@gluster.com>
Diffstat (limited to 'src/com.gluster.storage.management.gateway.scripts/src/backend')
-rwxr-xr-x | src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py index fd9b5ef6..374a7e9c 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py @@ -21,7 +21,7 @@ def main(): (options, args) = parser.parse_args() if len(args) != 1: - sys.stderr.write("usage: %s VOLUME_PATH [-d/--delete]\n" % os.path.basename(sys.argv[0])) + sys.stderr.write("usage: %s [-d | --delete] VOLUME_PATH\n" % os.path.basename(sys.argv[0])) sys.exit(-1) volumeDirectory = args[0] @@ -29,18 +29,20 @@ def main(): sys.stderr.write("Given volume directory path:%s does not exists\n" % volumeDirectory) sys.exit(1) - # trim '/' at the end if '/' == volumeDirectory[-1]: volumeDirectory = volumeDirectory[:-1] + newVolumeDirectoryName = "%s_%s" % (volumeDirectory, time.time()) if Utils.runCommand("mv -f %s %s" % (volumeDirectory, newVolumeDirectoryName), root=True) != 0: sys.stderr.write("Failed to rename volume directory\n") sys.exit(2) - if not options.todelete: - sys.exit(0) + if options.todelete: + process = Utils.runCommandBG("rm -fr %s" % newVolumeDirectoryName, root=True) + if not process: + sys.exit(3) + sys.exit(0) - sys.exit(Utils.runCommand("rm -fr %s" % newVolumeDirectoryName, root=True)) if __name__ == "__main__": main() |