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

* commit 'c224ac28adf1248dcd5716a0c6ed77825418fe0d': Treat already-renamed files as having no problems.
2014-10-23 20:44:55 +00:00
parent 38388a7216 c224ac28ad
commit e2aa0b8ad6
1 changed files with 3 additions and 0 deletions
@@ -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));