Fix rename error variable problem in site storage

This commit is contained in:
shortcutme 2019-04-23 01:59:59 +02:00
parent 6bd63ff42a
commit e688671972
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -240,16 +240,17 @@ class SiteStorage(object):
def rename(self, inner_path_before, inner_path_after): def rename(self, inner_path_before, inner_path_after):
for retry in range(3): for retry in range(3):
rename_err = None
# To workaround "The process cannot access the file beacause it is being used by another process." error # To workaround "The process cannot access the file beacause it is being used by another process." error
try: try:
os.rename(self.getPath(inner_path_before), self.getPath(inner_path_after)) os.rename(self.getPath(inner_path_before), self.getPath(inner_path_after))
err = None
break break
except Exception as err: except Exception as err:
rename_err = err
self.log.error("%s rename error: %s (retry #%s)" % (inner_path_before, err, retry)) self.log.error("%s rename error: %s (retry #%s)" % (inner_path_before, err, retry))
time.sleep(0.1 + retry) time.sleep(0.1 + retry)
if err: if rename_err:
raise err raise rename_err
# List files from a directory # List files from a directory
def walk(self, dir_inner_path, ignore=None): def walk(self, dir_inner_path, ignore=None):