Merge pull request xapi-project#3151 from lindig/use-globals

mseri · web-flow · commit 04f47f82aff9 · 2017-07-26T16:34:46.000+01:00
Use Xapi_globs.host_update_dir in pool_update.resync_host
diff --git a/ocaml/xapi/xapi_pool_update.ml b/ocaml/xapi/xapi_pool_update.ml
@@ -458,7 +458,7 @@ let detach_attached_updates __context =
     )
 
 let resync_host ~__context ~host =
-  let update_applied_dir = "/var/update/applied" in
+  let update_applied_dir = Filename.concat Xapi_globs.host_update_dir "applied" in
   if Sys.file_exists update_applied_dir then begin
     debug "pool_update.resync_host scanning directory %s for applied updates" update_applied_dir;
     let updates_applied = try Array.to_list (Sys.readdir update_applied_dir) with _ -> [] in

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ let detach_attached_updates __context =`
`458`	`458`	`)`
`459`	`459`
`460`	`460`	`let resync_host ~__context ~host =`
`461`		`- let update_applied_dir = "/var/update/applied" in`
	`461`	`+ let update_applied_dir = Filename.concat Xapi_globs.host_update_dir "applied" in`
`462`	`462`	`if Sys.file_exists update_applied_dir then begin`
`463`	`463`	`debug "pool_update.resync_host scanning directory %s for applied updates" update_applied_dir;`
`464`	`464`	`let updates_applied = try Array.to_list (Sys.readdir update_applied_dir) with _ -> [] in`