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

Ignore yaml files imported from other mods.

Browse Source
This commit is contained in:
Paul Chote
2018-04-29 19:27:34 +00:00
committed by reaperrr
parent 91295f9c68
commit 691c432b72
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/UtilityCommands/UpdateModCommand.cs
View File

@@ -117,6 +117,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
static void ApplyRules(ModData modData, IEnumerable<UpdateRule> rules, bool skipMaps)
{
Console.WriteLine();
var externalFilenames = new HashSet<string>();
foreach (var rule in rules)
{
var manualSteps = new List<string>();
@@ -127,7 +129,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
try
{
Console.Write(" Updating mod... ");
manualSteps.AddRange(UpdateUtils.UpdateMod(modData, rule, out allFiles));
manualSteps.AddRange(UpdateUtils.UpdateMod(modData, rule, out allFiles, externalFilenames));
Console.WriteLine("COMPLETE");
}
catch (Exception ex)
@@ -150,13 +152,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (!skipMaps)
{
var mapsFailed = false;
var externalFilenames = new HashSet<string>();
var mapExternalFilenames = new HashSet<string>();
foreach (var package in modData.MapCache.EnumerateMapPackagesWithoutCaching())
{
try
{
YamlFileSet mapFiles;
var mapSteps = UpdateUtils.UpdateMap(modData, package, rule, out mapFiles, externalFilenames);
var mapSteps = UpdateUtils.UpdateMap(modData, package, rule, out mapFiles, mapExternalFilenames);
allFiles.AddRange(mapFiles);
if (mapSteps.Any())
@@ -201,6 +203,14 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine();
}
if (externalFilenames.Any())
{
Console.WriteLine("The following external mod files have been ignored:");
Console.WriteLine(UpdateUtils.FormatMessageList(externalFilenames));
Console.WriteLine("These files should be updated by running --update-mod on the referenced mod(s)");
Console.WriteLine();
}
Console.WriteLine("Semi-automated update complete.");
Console.WriteLine("Please review the messages above for any manual actions that must be applied.");
}