commit a926efce281f9280dbe01d16798aaed1dd881c06
author Yifan Hong <elsk@google.com> Fri Nov 20 20:32:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 20:32:44 2020 +0000
tree d5eecfa4da651a24aa7eaac70681bab0e25bcb0d
parent c3792a57062ff8d3e9fd1a7ec9670bbcda5206d8
parent 7e7f881508cbda09f7092919052f28b84a63a30d

init: don't abort if directory already exists am: 7e7f881508

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506376

Change-Id: I5a70265e408300a3343e95633f2e447d880f70b1

init/first_stage_init.cpp

diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index 91aaffd..83a32e7 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -117,7 +117,7 @@
 
     auto dst_dir = android::base::Dirname(dst);
     std::error_code ec;
-    if (!fs::create_directories(dst_dir, ec)) {
+    if (!fs::create_directories(dst_dir, ec) && !!ec) {
         LOG(FATAL) << "Cannot create " << dst_dir << ": " << ec.message();
     }
     if (rename(src, dst) != 0) {
@@ -315,7 +315,7 @@
         std::string dest = GetRamdiskPropForSecondStage();
         std::string dir = android::base::Dirname(dest);
         std::error_code ec;
-        if (!fs::create_directories(dir, ec)) {
+        if (!fs::create_directories(dir, ec) && !!ec) {
             LOG(FATAL) << "Can't mkdir " << dir << ": " << ec.message();
         }
         if (!fs::copy_file(kBootImageRamdiskProp, dest, ec)) {