diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-19 12:07:38 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-19 12:07:38 +0300 |
| commit | 5ed1e236bc0db0f1480344d0934cbb42df20df7b (patch) | |
| tree | d242fecf6d74a1af7b00760c1fd23a62fddda1c0 /Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate | |
| parent | db94be7a673886297f5a6dfe4331793452a9f609 (diff) | |
| parent | 1d2d515c91a78a8a3e373e05ae925ba6af1f32fd (diff) | |
| download | Tango-5ed1e236bc0db0f1480344d0934cbb42df20df7b.tar.gz Tango-5ed1e236bc0db0f1480344d0934cbb42df20df7b.zip | |
merge, no change
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs index 3061b9506..31b2f5534 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs @@ -358,7 +358,7 @@ namespace Tango.PPC.Common.MachineUpdate ExaminerSequenceConfiguration config_sequence = ExaminerSequenceConfiguration.FromFile(config_file); - foreach (var item in config_sequence.Items.Where(x => x.Type == ExaminerSequenceItemType.Data).OrderBy(x => x.Index)) + foreach (var item in config_sequence.Items.Where(x => x.Type == ExaminerSequenceItemType.Data || update_response.PerformSchemaUpdate).OrderBy(x => x.Index)) { LogManager.Log($"Executing update script '{item.FileName}...'"); @@ -375,7 +375,7 @@ namespace Tango.PPC.Common.MachineUpdate var config = builder.Build(); - ExaminerProcess process = new ExaminerProcess(config, ExaminerProcessType.Data); + ExaminerProcess process = new ExaminerProcess(config, item.Type == ExaminerSequenceItemType.Data ? ExaminerProcessType.Data : ExaminerProcessType.Schema); process.Progress += (x, msg) => { LogManager.Log(msg); @@ -389,7 +389,7 @@ namespace Tango.PPC.Common.MachineUpdate if (result.ExitCode != ExaminerProcessExitCode.Success) { - throw LogManager.Log(new InvalidDataException(String.Format("OverrideData script has terminated with exit code '{0}'.", result.ExitCode))); + throw LogManager.Log(new InvalidDataException($"{item.FileName} script has terminated with exit code '{result.ExitCode}'.")); } LogManager.Log("Script executed successfully."); |
