From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 14 Oct 2014 17:41:32 +0000 (+0200)
Subject: CLI: Make sure that en/disable errors are marked as such
X-Git-Tag: v2.2.0~392
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9df1b6bc1c6398519ec1711bad511ba1c121a1ca;p=icinga2

CLI: Make sure that en/disable errors are marked as such

fixes #7379
---

diff --git a/lib/cli/featuredisablecommand.cpp b/lib/cli/featuredisablecommand.cpp
index 725c0c5c1..1dbc6dbbf 100644
--- a/lib/cli/featuredisablecommand.cpp
+++ b/lib/cli/featuredisablecommand.cpp
@@ -88,6 +88,8 @@ int FeatureDisableCommand::Run(const boost::program_options::variables_map& vm,
                 if (unlink(target.CStr()) < 0) {
 			Log(LogCritical, "cli", "Cannot disable feature '" + feature + "'. Unlinking target file '" + target +
 			    "' failed with error code " + Convert::ToString(errno) + ", \"" + Utility::FormatErrorNumber(errno) + "\".");
+                        errors.push_back(feature);
+                        continue;
 		}
 
                 Log(LogInformation, "cli", "Disabling feature " + feature + " in '" + features_enabled_dir + "'.");
diff --git a/lib/cli/featureenablecommand.cpp b/lib/cli/featureenablecommand.cpp
index 13b8b87c9..e7375bbad 100644
--- a/lib/cli/featureenablecommand.cpp
+++ b/lib/cli/featureenablecommand.cpp
@@ -101,6 +101,8 @@ int FeatureEnableCommand::Run(const boost::program_options::variables_map& vm, c
                 if (symlink(source.CStr(), target.CStr()) < 0) {
 			Log(LogCritical, "cli", "Cannot enable feature '" + feature + "'. Linking source '" + source + "' to target file '" + target +
 			    "' failed with error code " + Convert::ToString(errno) + ", \"" + Utility::FormatErrorNumber(errno) + "\".");
+                        errors.push_back(feature);
+                        continue;
 		}
 
                 Log(LogInformation, "cli", "Enabling feature '" + feature + "' in '" + features_enabled_dir + "'.");