From 055bed59184700fc27479c11d02c3e7bcd7aa582 Mon Sep 17 00:00:00 2001 From: Bjorn Brala Date: Wed, 19 Oct 2016 20:55:56 +0200 Subject: [PATCH] removed an extra echo and added proper error message when there is incompatibilities. Appearantly importing into a compressed folder wont work and will result in an error. --- plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 b/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 index f66c181f6..9855763ec 100644 --- a/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 +++ b/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 @@ -18,8 +18,6 @@ [string]$differencing_disk=$null ) -"$($data_path)/Snapshots" - # Include the following modules $Dir = Split-Path $script:MyInvocation.MyCommand.Path . ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1")) @@ -124,9 +122,11 @@ if ($generation -ne 1) { } $report = Compare-VM -CompatibilityReport $vmConfig + +£ Stop if there is incomatibilities which would fail anyhow. if($report.Incompatibilities.Length -gt 0){ -$report.Incompatibilities - Write-Error-Message ConvertTo-Json $report.Incompatibilities + Write-Error-Message $(ConvertTo-Json $($report.Incompatibilities | Select -ExpandProperty Message)) + exit 0 } # Differencing disk @@ -150,7 +150,7 @@ if($differencing_disk){ } } - + Import-VM -CompatibilityReport $vmConfig $vm_id = (Get-VM $vm_name).id.guid