mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-26 23:24:09 +02:00
Cli: Don't run 'agent update-config' if there are uncommitted changes
refs #7249
This commit is contained in:
parent
7e73533ad4
commit
034cd9c140
@ -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
|
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")
|
Log(LogInformation, "cli")
|
||||||
<< "Updating agent configuration for ";
|
<< "Updating agent configuration for ";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user