summaryrefslogtreecommitdiff
path: root/cmds/installd/utils.cpp
diff options
context:
space:
mode:
author Shubham Ajmera <shubhamajmera@google.com> 2017-09-14 11:07:33 -0700
committer Andreas Gampe <agampe@google.com> 2017-10-31 14:51:58 -0700
commitec0afbfa7bdeeb6d8585071a5944ab8b13cd9345 (patch)
tree7d7989515932893901aa6bca819f6a7eafb9587d /cmds/installd/utils.cpp
parentdd42e278aa2e5fd504901798aad064e102ee4a61 (diff)
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
Diffstat (limited to 'cmds/installd/utils.cpp')
-rw-r--r--cmds/installd/utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 93d5c0b9c0..7a562ca69d 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -1074,7 +1074,7 @@ int prepare_app_cache_dir(const std::string& parent, const char* name, mode_t ta
} 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