modulemanager: Shorten metadata keys to improve readability and memorability
authorMatthew Wild <mwild1@gmail.com>
Fri, 04 Feb 2022 15:42:13 +0000
changeset 12261 7adfd5d29576
parent 12260 8fd3eebb8966
child 12262 99560987ea19
modulemanager: Shorten metadata keys to improve readability and memorability
core/modulemanager.lua
--- a/core/modulemanager.lua	Fri Feb 04 15:13:13 2022 +0000
+++ b/core/modulemanager.lua	Fri Feb 04 15:42:13 2022 +0000
@@ -66,16 +66,16 @@
 			end
 		end
 
-		if metadata.conflicts_core_features then
-			local conflicts_core_features = set.new(array.collect(metadata.conflicts_core_features:gmatch("[^, ]+")));
-			local conflicted_features = set.intersection(conflicts_core_features, core_features);
+		if metadata.conflicts then
+			local conflicts_features = set.new(array.collect(metadata.conflicts:gmatch("[^, ]+")));
+			local conflicted_features = set.intersection(conflicts_features, core_features);
 			if not conflicted_features:empty() then
 				log("warn", "Not loading module, due to conflicting features '%s': %s", conflicted_features, path);
 				return; -- Don't load this module
 			end
 		end
-		if metadata.requires_core_features then
-			local required_features = set.new(array.collect(metadata.requires_core_features:gmatch("[^, ]+")));
+		if metadata.requires then
+			local required_features = set.new(array.collect(metadata.requires:gmatch("[^, ]+")));
 			local missing_features = required_features - core_features;
 			if not missing_features:empty() then
 				log("warn", "Not loading module, due to missing features '%s': %s", missing_features, path);