From 5c6b32b143648d22cc97676257460aa5a4d1938c Mon Sep 17 00:00:00 2001 From: gus33000 Date: Sun, 6 Mar 2016 08:47:21 +0100 Subject: [PATCH] fixes ESD-ISO bug when combining Pro and Core in the correct way --- bin/esd_lib.ps1 | 2 +- bin/main.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/esd_lib.ps1 b/bin/esd_lib.ps1 index 4d07b84..e8ef4c5 100644 --- a/bin/esd_lib.ps1 +++ b/bin/esd_lib.ps1 @@ -645,7 +645,7 @@ function Get-InfosFromESD ( if ($esdinformations.count -eq 1) { $DVDLabel = $esdinformations[0].VolumeLabel - } elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Core" -and $esdinformations[1].Editions -eq "Professional" -and $parts -eq 1) { + } elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Professional" -and $esdinformations[1].Editions -eq "Core" -and $parts -eq 1) { $DVDLabel = ($tag+'_CCSA_'+$arch+$ltag+$esdinformations[0].LanguageCode+'_'+$DVD).ToUpper() } else { $DVDLabel = "ESD-ISO" diff --git a/bin/main.ps1 b/bin/main.ps1 index 8d3f91b..3468cea 100644 --- a/bin/main.ps1 +++ b/bin/main.ps1 @@ -616,7 +616,7 @@ function global:Get-InfosFromESD ( if ($esdinformations.count -eq 1) { $DVDLabel = $esdinformations[0].VolumeLabel - } elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Core" -and $esdinformations[1].Editions -eq "Professional" -and $parts -eq 1) { + } elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Professional" -and $esdinformations[1].Editions -eq "Core" -and $parts -eq 1) { $DVDLabel = ($tag+'_CCSA_'+$arch+$ltag+$esdinformations[0].LanguageCode+'_'+$DVD).ToUpper() } else { $DVDLabel = "ESD-ISO"