diff options
| author | Michael Runge <mrunge@google.com> | 2014-10-23 16:34:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-23 16:34:38 +0000 |
| commit | 3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc (patch) | |
| tree | f3f047ecc65ab48c1c7f49d5cef784936292e1b1 /updater | |
| parent | 9eb8c8bdbe4965e9a92d83882e97cf67aee20821 (diff) | |
| parent | 2f0ef73029fc51c6404121f338b034c8b516652c (diff) | |
| download | bootable_recovery-3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc.zip bootable_recovery-3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc.tar.gz bootable_recovery-3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc.tar.bz2 | |
am 2f0ef730: Treat already-renamed files as having no problems.
* commit '2f0ef73029fc51c6404121f338b034c8b516652c':
Treat already-renamed files as having no problems.
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/install.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/updater/install.c b/updater/install.c index dad0d08..42dbb58 100644 --- a/updater/install.c +++ b/updater/install.c @@ -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)); |