commit ec0afbfa7bdeeb6d8585071a5944ab8b13cd9345
author Shubham Ajmera <shubhamajmera@google.com> Thu Sep 14 11:07:33 2017 -0700
committer Andreas Gampe <agampe@google.com> Tue Oct 31 14:51:58 2017 -0700
tree 7d7989515932893901aa6bca819f6a7eafb9587d
parent dd42e278aa2e5fd504901798aad064e102ee4a61

Fix up error message in installd::prepare_app_cache_dir

Fix log when actual_mode and target_mode of the app_cache_dir
mismatch.

Current log - Mismatched cache GID/mode at <path>: found 10021 but \
               expected 10021
New log - Mismatched cache GID/mode at <path>: found 10021/target_mode \
               but expected 10021/actual_mode

(cherry picked from commit 347ac5dfff256ba71a0abd242edb49b9f5dadfdb)

Test: make

Merged-In: I0f9041ed5d436ccf8265cbab3852ae8d1b17a74a
Change-Id: I0f9041ed5d436ccf8265cbab3852ae8d1b17a74a

cmds/installd/utils.cpp

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 93d5c0b..7a562ca 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -1074,7 +1074,7 @@
     } else {
         // Mismatched GID/mode is recoverable; fall through to update
         LOG(DEBUG) << "Mismatched cache GID/mode at " << path << ": found " << st.st_gid
-                << " but expected " << gid;
+                << "/" << actual_mode << " but expected " << gid << "/" << target_mode;
     }
 
     // Directory is owned correctly, but GID or mode mismatch means it's