Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-225731: XenCenter: Find the ISO update in the zip file defined in CFU

Browse Source 
Always define the extension to search for

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2016-10-19 13:39:14 +01:00
parent 8ac6774e80
commit 225885ac45
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Wizards/PatchingWizard/PlanActions/DownloadPatchPlanAction.cs
View File

@ -89,9 +89,7 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
Uri address = new Uri(patchUri);
tempFileName = Path.GetTempFileName();
bool isIso = patchUri.ToLowerInvariant().EndsWith("iso");
var downloadAction = new DownloadAndUnzipXenServerPatchAction(patch.Name, address, tempFileName);
var downloadAction = new DownloadAndUnzipXenServerPatchAction(patch.Name, address, tempFileName, Helpers.ElyOrGreater(Connection) ? "iso" : Branding.Update);
if (downloadAction != null)
{

5
XenModel/Actions/Updates/DownloadAndUnzipXenServerPatchAction.cs
View File

@ -59,7 +59,7 @@ namespace XenAdmin.Actions
}
public DownloadAndUnzipXenServerPatchAction(string patchName, Uri uri, string outputFileName)
: this(patchName, uri, outputFileName, null)
: this(patchName, uri, outputFileName, InvisibleMessages.XEN_UPDATE)
{ }
public DownloadAndUnzipXenServerPatchAction(string patchName, Uri uri, string outputFileName, string updateFileExtension)
@ -125,8 +125,7 @@ namespace XenAdmin.Actions
{
string currentExtension = Path.GetExtension(iterator.CurrentFileName());
if (!string.IsNullOrEmpty(updateFileExtension) && currentExtension == "." + updateFileExtension
|| currentExtension == ".iso" || currentExtension == ".xsupdate")
if (!string.IsNullOrEmpty(updateFileExtension) && currentExtension == "." + updateFileExtension)
{
string path = Path.Combine(Path.GetDirectoryName(outFileName), iterator.CurrentFileName());