CP-308455 VM.sysprep CA-414158 wait for "action" key to disappear

Christian Lindig · Christian Lindig · commit de09270488c5 · 2025-07-24T13:20:20.000+01:00
The code misses the timeout exception becaue of we are using a module
alias.

Signed-off-by: Christian Lindig &lt;christian.lindig@cloud.com&gt;
diff --git a/ocaml/xapi/vm_sysprep.ml b/ocaml/xapi/vm_sysprep.ml
@@ -229,7 +229,7 @@ let trigger ~domid ~uuid ~timeout =
         debug "%s sysprep is finished" __FUNCTION__ ;
         Watch.(wait_for ~xs ~timeout (key_to_disappear domain)) ;
         true
-      with Watch.Timeout _ ->
+      with Watch.Timeout _ | Ezxenstore_core.Watch.Timeout _->
         debug "%s: sysprep timeout" __FUNCTION__ ;
         false
   )

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ let trigger ~domid ~uuid ~timeout =`
`229`	`229`	`debug "%s sysprep is finished" __FUNCTION__ ;`
`230`	`230`	`Watch.(wait_for ~xs ~timeout (key_to_disappear domain)) ;`
`231`	`231`	`true`
`232`		`- with Watch.Timeout _ ->`
	`232`	`+ with Watch.Timeout _ \| Ezxenstore_core.Watch.Timeout _->`
`233`	`233`	`debug "%s: sysprep timeout" __FUNCTION__ ;`
`234`	`234`	`false`
`235`	`235`	`)`