diff options
| author | Maxime Dénès | 2017-06-22 16:27:00 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-06-22 16:27:00 +0200 |
| commit | 8d92701f1a017354504c84d60c9e76da50feaf49 (patch) | |
| tree | a9fae4cc1c17d888ed14c8a6072f4eda93123133 | |
| parent | d30ed5fe0694466f70eed51bc689cd0fa8c00da5 (diff) | |
| parent | 64f0a3f014e423e4f7aa4fc1dc47cb70bc0e81fa (diff) | |
Merge PR#817: [stm] Fix route setting on VtQuery
| -rw-r--r-- | stm/stm.ml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index 071d2edf98..a7ed84350b 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -2523,11 +2523,12 @@ let process_transaction ?(newtip=Stateid.fresh ()) | VtQuery (false, route), VtNow -> begin let query_sid = VCS.cur_tip () in - try stm_vernac_interp (VCS.cur_tip ()) x + try stm_vernac_interp ~route (VCS.cur_tip ()) x with e -> let e = CErrors.push e in Exninfo.iraise (State.exn_on ~valid:Stateid.dummy query_sid e) end; `Ok + (* Part of the script commands don't set the query route *) | VtQuery (true, _route), w -> let id = VCS.new_node ~id:newtip () in let queue = |
