Skip to content

Commit 7e24595

Browse files
committed
Fix regression in OpamSystem.translate_patch
OpamSystem.translate_patch embarrassingly only transformed patches when --debug was in effect.
1 parent ad37738 commit 7e24595

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

master_changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ users)
9090
## Shell
9191

9292
## Internal
93+
* Fix error in `OpamSystem.transform_patch` - patches were only applied when debugging [#6182 @dra27 regression since #3449]
9394

9495
## Internal: Windows
9596

src/core/opamSystem.ml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1505,12 +1505,13 @@ let translate_patch ~dir orig corrected =
15051505
else
15061506
(id, (fun s -> s ^ "\r"), strip 1)
15071507
in
1508-
if OpamConsole.debug () then
1508+
if OpamConsole.debug () then begin
15091509
let log_transform (first_line, last_line, add_cr) =
15101510
let indicator = if add_cr then '+' else '-' in
15111511
log ~level:3 "Transform %d-%d %c\\r" first_line last_line indicator
15121512
in
1513-
List.iter log_transform transforms;
1513+
List.iter log_transform transforms
1514+
end;
15141515
let rec fold_lines n transforms =
15151516
match input_line ch with
15161517
| line ->

0 commit comments

Comments
 (0)