Treat already-renamed files as having no problems.
This should help with reentrant OTAs. Bug: 18079773 Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
This commit is contained in:
@@ -358,6 +358,9 @@ Value* RenameFn(const char* name, State* state, int argc, Expr* argv[]) {
|
||||
if (make_parents(dst_name) != 0) {
|
||||
ErrorAbort(state, "Creating parent of %s failed, error %s",
|
||||
dst_name, strerror(errno));
|
||||
} else if (access(dst_name, F_OK) == 0 && access(src_name, F_OK) != 0) {
|
||||
// File was already moved
|
||||
result = dst_name;
|
||||
} else if (rename(src_name, dst_name) != 0) {
|
||||
ErrorAbort(state, "Rename of %s to %s failed, error %s",
|
||||
src_name, dst_name, strerror(errno));
|
||||
|
||||
Reference in New Issue
Block a user