Merge branch 'bebehei-feature-disabled'

fixes #121 fixes #4909
2017-02-02 14:22:38 +01:00 · 2017-02-02 14:22:38 +01:00 · aacc535acf
parent 4658cb391e 9337135249
commit aacc535acf
1 changed files with 2 additions and 3 deletions
--- a/lib/cli/featureutility.cpp
+++ b/lib/cli/featureutility.cpp
@ -146,9 +146,8 @@ int FeatureUtility::DisableFeatures(const std::vector<std::string>& features)
 		String target = features_enabled_dir + "/" + feature + ".conf";

 		if (!Utility::PathExists(target) ) {
-			Log(LogCritical, "cli")
-			    << "Cannot disable feature '" << feature << "'. Target file '" << target << "' does not exist.";
-			errors.push_back(feature);
+			Log(LogWarning, "cli")
+			    << "Feature '" << feature << "' already disabled.";
 			continue;
 		}