domain check fix

jarig · jarig · commit b11599d7edf6 · 2016-06-13T22:55:52.000+03:00
diff --git a/lib/kitchen/driver/vmm_version.rb b/lib/kitchen/driver/vmm_version.rb
@@ -2,6 +2,6 @@
 
 module Kitchen
   module Driver
-      VMM_VERSION = '0.1.1'
+      VMM_VERSION = '0.1.2'
   end
 end
diff --git a/support/import_vm.ps1 b/support/import_vm.ps1
@@ -139,7 +139,7 @@ $script_block = {
   }
 
   $fqdn = $vm.ComputerNameString
-  if ( ! $fqdn.contains($domain_name) )
+  if ( $domain_name -and ! $fqdn.contains(".") -and  ! $fqdn.contains($domain_name) )
   {
     # Linux machines do not always set domain name propery for example
     $fqdn = "$fqdn.$domain_name"

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ $script_block = {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`$fqdn = $vm.ComputerNameString`
`142`		`- if ( ! $fqdn.contains($domain_name) )`
	`142`	`+ if ( $domain_name -and ! $fqdn.contains(".") -and ! $fqdn.contains($domain_name) )`
`143`	`143`	`{`
`144`	`144`	`# Linux machines do not always set domain name propery for example`
`145`	`145`	`$fqdn = "$fqdn.$domain_name"`