tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "When encountered an unexpected status, mention it"

Browse source
This commit is contained in:
Treehugger Robot 2020-01-23 21:30:31 +00:00 committed by Gerrit Code Review
commit 071c4b37e8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -828,7 +828,8 @@ UpdateState SnapshotManager::CheckMergeState(LockedFile* lock) {
cancelled = true;
break;
default:
LOG(ERROR) << "Unknown merge status: " << static_cast<uint32_t>(snapshot_state);
LOG(ERROR) << "Unknown merge status for \"" << snapshot << "\": "
<< "\"" << snapshot_state << "\"";
failed = true;
break;
}
@ -1706,7 +1707,7 @@ static UpdateState UpdateStateFromString(const std::string& contents) {
} else if (contents == "merge-failed") {
return UpdateState::MergeFailed;
} else {
LOG(ERROR) << "Unknown merge state in update state file";
LOG(ERROR) << "Unknown merge state in update state file: \"" << contents << "\"";
return UpdateState::None;
}
}
@ -1728,7 +1729,7 @@ std::ostream& operator<<(std::ostream& os, UpdateState state) {
case UpdateState::MergeFailed:
return os << "merge-failed";
default:
LOG(ERROR) << "Unknown update state";
LOG(ERROR) << "Unknown update state: " << static_cast<uint32_t>(state);
return os;
}
}