PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.

Browse Source 
* commit '3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc':
  Treat already-renamed files as having no problems.
This commit is contained in:
Michael Runge
2014-10-23 20:40:59 +00:00
committed by Android Git Automerger
parent 0745fbfad9 3b5c6dca0a
commit c224ac28ad
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/install.c
+3
View File
@@ -358,6 +358,9 @@ Value* RenameFn(const char* name, State* state, int argc, Expr* argv[]) {
if (make_parents(dst_name) != 0) { if (make_parents(dst_name) != 0) {
ErrorAbort(state, "Creating parent of %s failed, error %s", ErrorAbort(state, "Creating parent of %s failed, error %s",
dst_name, strerror(errno)); 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) { } else if (rename(src_name, dst_name) != 0) {
ErrorAbort(state, "Rename of %s to %s failed, error %s", ErrorAbort(state, "Rename of %s to %s failed, error %s",
src_name, dst_name, strerror(errno)); src_name, dst_name, strerror(errno));