epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error messages when merging duplicate yaml

Browse Source
This commit is contained in:
Scott_NZ
2013-02-08 12:01:29 +13:00
parent 6403c5e6af
commit e71135b511
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.FileFormats/MiniYaml.cs
View File

@@ -200,8 +200,8 @@ namespace OpenRA.FileFormats
var ret = new List<MiniYamlNode>(); var ret = new List<MiniYamlNode>();
var aDict = a.ToDictionary( x => x.Key ); var aDict = a.ToDictionaryWithConflictLog(x => x.Key, "MiniYaml.Merge", null, x => "{0} (at {1})".F(x.Key, x.Location));
var bDict = b.ToDictionary( x => x.Key ); var bDict = b.ToDictionaryWithConflictLog(x => x.Key, "MiniYaml.Merge", null, x => "{0} (at {1})".F(x.Key, x.Location));
var keys = aDict.Keys.Union( bDict.Keys ).ToList(); var keys = aDict.Keys.Union( bDict.Keys ).ToList();
var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-') var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')