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

List ignored map includes only once.

Browse Source
This commit is contained in:
Paul Chote
2018-04-29 20:28:58 +01:00
committed by reaperrr
parent 691c432b72
commit 677d004cfa
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs
View File

@@ -74,6 +74,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
static void ApplyRules(ModData modData, IReadWritePackage mapPackage, IEnumerable<UpdateRule> rules) static void ApplyRules(ModData modData, IReadWritePackage mapPackage, IEnumerable<UpdateRule> rules)
{ {
var externalFilenames = new HashSet<string>();
foreach (var rule in rules) foreach (var rule in rules)
{ {
Console.WriteLine("{0}: {1}", rule.GetType().Name, rule.Name); Console.WriteLine("{0}: {1}", rule.GetType().Name, rule.Name);
@@ -82,7 +83,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.Write(" Updating map... "); Console.Write(" Updating map... ");
var externalFilenames = new HashSet<string>();
try try
{ {
manualSteps = UpdateUtils.UpdateMap(modData, mapPackage, rule, out mapFiles, externalFilenames); manualSteps = UpdateUtils.UpdateMap(modData, mapPackage, rule, out mapFiles, externalFilenames);
@@ -105,13 +105,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
mapFiles.Save(); mapFiles.Save();
Console.WriteLine("COMPLETE"); Console.WriteLine("COMPLETE");
if (externalFilenames.Any())
{
Console.WriteLine(" The following shared yaml files referenced by the map have been ignored:");
Console.WriteLine(UpdateUtils.FormatMessageList(externalFilenames, 1));
Console.WriteLine(" These files are assumed to have already been updated by the --update-mod command");
}
if (manualSteps.Any()) if (manualSteps.Any())
{ {
Console.WriteLine(" Manual changes are required to complete this update:"); Console.WriteLine(" Manual changes are required to complete this update:");
@@ -122,6 +115,14 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine(); Console.WriteLine();
} }
if (externalFilenames.Any())
{
Console.WriteLine("The following shared yaml files referenced by the map have been ignored:");
Console.WriteLine(UpdateUtils.FormatMessageList(externalFilenames));
Console.WriteLine("These files are assumed to have already been updated by the --update-mod command");
Console.WriteLine();
}
Console.WriteLine("Semi-automated update complete."); Console.WriteLine("Semi-automated update complete.");
Console.WriteLine("Please review the messages above for any manual actions that must be applied."); Console.WriteLine("Please review the messages above for any manual actions that must be applied.");
} }