diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs index dbfd82496..a02aa3e67 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs @@ -111,7 +111,7 @@ namespace XenAdmin.Wizards.PatchingWizard var wizardMode = PatchingWizard_SelectPatchPage.WizardMode; var wizardIsInAutomatedUpdatesMode = wizardMode == WizardMode.AutomatedUpdates; - var updateType = wizardIsInAutomatedUpdatesMode ? UpdateType.NewRetail : PatchingWizard_SelectPatchPage.SelectedUpdateType; + var updateType = wizardIsInAutomatedUpdatesMode ? UpdateType.Legacy : PatchingWizard_SelectPatchPage.SelectedUpdateType; var newPatch = wizardIsInAutomatedUpdatesMode ? null : PatchingWizard_SelectPatchPage.SelectedNewPatch; var existPatch = wizardIsInAutomatedUpdatesMode ? null : PatchingWizard_SelectPatchPage.SelectedExistingPatch; var alertPatch = wizardIsInAutomatedUpdatesMode ? null : PatchingWizard_SelectPatchPage.SelectedUpdateAlert; @@ -186,7 +186,7 @@ namespace XenAdmin.Wizards.PatchingWizard } else if (prevPageType == typeof(PatchingWizard_UploadPage)) { - if (PatchingWizard_SelectPatchPage.SelectedUpdateType == UpdateType.NewRetail) + if (PatchingWizard_SelectPatchPage.SelectedUpdateType == UpdateType.Legacy) { PatchingWizard_SelectPatchPage.SelectedUpdateType = UpdateType.Existing; PatchingWizard_SelectPatchPage.SelectedExistingPatch = PatchingWizard_UploadPage.Patch; diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.cs index 71b60cf79..d6b90bcb1 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.cs @@ -87,7 +87,7 @@ namespace XenAdmin.Wizards.PatchingWizard switch (SelectedUpdateType) { - case UpdateType.NewRetail: + case UpdateType.Legacy: case UpdateType.Existing: ManualTextInstructions = ModePoolPatch(out someHostMayRequireRestart); automaticDisabled = anyPoolForbidsAutostart && someHostMayRequireRestart; diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.cs index 7523695e5..01f2e2067 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.cs @@ -248,7 +248,7 @@ namespace XenAdmin.Wizards.PatchingWizard } else //legacy format { - SelectedUpdateType = UpdateType.NewRetail; + SelectedUpdateType = UpdateType.Legacy; } } else @@ -256,7 +256,7 @@ namespace XenAdmin.Wizards.PatchingWizard if (WizardHelpers.IsValidFile(fileName)) { if (fileName.EndsWith("." + Branding.Update)) - SelectedUpdateType = UpdateType.NewRetail; + SelectedUpdateType = UpdateType.Legacy; else if (fileName.EndsWith("." + Branding.UpdateIso)) SelectedUpdateType = UpdateType.ISO; else @@ -465,13 +465,13 @@ namespace XenAdmin.Wizards.PatchingWizard { if (downloadUpdateRadioButton.Checked) { - return SelectedUpdateType == UpdateType.NewRetail || SelectedUpdateType == UpdateType.ISO + return SelectedUpdateType == UpdateType.Legacy || SelectedUpdateType == UpdateType.ISO ? ((PatchGridViewRow) dataGridViewPatches.SelectedRows[0]).PathPatch : null; } else if (selectFromDiskRadioButton.Checked) { - return SelectedUpdateType == UpdateType.NewRetail || SelectedUpdateType == UpdateType.ISO + return SelectedUpdateType == UpdateType.Legacy || SelectedUpdateType == UpdateType.ISO ? WizardHelpers.IsValidFile(unzippedUpdateFilePath) && Path.GetExtension(FilePath).ToLowerInvariant().Equals(".zip") ? unzippedUpdateFilePath @@ -762,5 +762,5 @@ namespace XenAdmin.Wizards.PatchingWizard #endregion } - public enum UpdateType { NewRetail, Existing, ISO} + public enum UpdateType { Legacy, Existing, ISO} } diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs index 400088940..3e47860dd 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs @@ -265,7 +265,7 @@ namespace XenAdmin.Wizards.PatchingWizard switch (SelectedUpdateType) { - case UpdateType.NewRetail: + case UpdateType.Legacy: case UpdateType.Existing: if (Helpers.ElyOrGreater(host)) { diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs index 36aae1cbb..b10a630ec 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs @@ -204,7 +204,7 @@ namespace XenAdmin.Wizards.PatchingWizard AsyncAction action = null; switch (SelectedUpdateType) { - case UpdateType.NewRetail: + case UpdateType.Legacy: if (CanUploadUpdateOnHost(SelectedNewPatchPath, selectedServer)) { bool deleteFileOnCancel = AllDownloadedPatches.ContainsValue(SelectedNewPatchPath); @@ -295,7 +295,7 @@ namespace XenAdmin.Wizards.PatchingWizard AsyncAction action = null; switch (SelectedUpdateType) { - case UpdateType.NewRetail: + case UpdateType.Legacy: if (CanUploadUpdateOnHost(SelectedNewPatchPath, master)) action = new CheckDiskSpaceForPatchUploadAction(master, SelectedNewPatchPath, true); break;