tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cli: Don't run 'agent update-config' if there are uncommitted changes 

refs #7249
This commit is contained in:
Michael Friedrich 2014-10-27 19:15:34 +01:00
parent 7e73533ad4
commit 034cd9c140
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cli/agentupdateconfigcommand.cpp
View File

@ -57,6 +57,15 @@ ImpersonationLevel AgentUpdateConfigCommand::GetImpersonationLevel(void) const
*/
int AgentUpdateConfigCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
{
//If there are changes pending, abort the current operation
if (RepositoryUtility::ChangeLogHasPendingChanges()) {
Log(LogWarning, "cli")
<< "There are pending changes for commit.\n"
<< "Please review and commit them using 'icinga2 repository commit [--simulate]\n"
<< "or drop them using 'icinga2 repository commit --clear' before proceeding.";
return 1;
}
Log(LogInformation, "cli")
<< "Updating agent configuration for ";