Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6933673 authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Retry the dir deletion if can't rename. 

Previously we would give up.

Bug: 226580398
Fixes: 226580398
Test: atest installd_service_test installd_cache_test installd_utils_test installd_dexopt_test installd_otapreopt_test installd_file_test
Change-Id: I791116f52397b24747bc7cbb1f94c696d0b832c1
parent 171a64a8

cmds/installd/utils.cpp

+5 −5
Original line number Diff line number Diff line
@@ -705,16 +705,16 @@ static int rename_delete_dir_contents(const std::string& pathname, 
    auto temp_dir_path =

            base::StringPrintf("%s/%s", Dirname(pathname).c_str(), temp_dir_name.c_str());



    if (::rename(pathname.c_str(), temp_dir_path.c_str())) {

    auto dir_to_delete = temp_dir_path.c_str();

    if (::rename(pathname.c_str(), dir_to_delete)) {

        if (ignore_if_missing && (errno == ENOENT)) {

            return 0;

        }

        ALOGE("Couldn't rename %s -> %s: %s \n", pathname.c_str(), temp_dir_path.c_str(),

              strerror(errno));

        return -errno;

        ALOGE("Couldn't rename %s -> %s: %s \n", pathname.c_str(), dir_to_delete, strerror(errno));

        dir_to_delete = pathname.c_str();

    }



    return delete_dir_contents(temp_dir_path.c_str(), 1, exclusion_predicate, ignore_if_missing);

    return delete_dir_contents(dir_to_delete, 1, exclusion_predicate, ignore_if_missing);

}



bool is_renamed_deleted_dir(const std::string& path) {