- result = True,
- if not old_file_storage_dir or not new_file_storage_dir:
- result = False,
- else:
- if not os.path.exists(new_file_storage_dir):
- if os.path.isdir(old_file_storage_dir):
- try:
- os.rename(old_file_storage_dir, new_file_storage_dir)
- except OSError, err:
- logging.exception("Cannot rename '%s' to '%s'",
- old_file_storage_dir, new_file_storage_dir)
- result = False,
- else:
- logging.error("'%s' is not a directory", old_file_storage_dir)
- result = False,
+ if not os.path.exists(new_file_storage_dir):
+ if os.path.isdir(old_file_storage_dir):
+ try:
+ os.rename(old_file_storage_dir, new_file_storage_dir)
+ except OSError, err:
+ _Fail("Cannot rename '%s' to '%s': %s",
+ old_file_storage_dir, new_file_storage_dir, err)