Commit 65b9129
committed
fix(internal): post-merge cleanups in config + settings_ui
- _read_backup_override_file now WARNING-logs unreadable / corrupt /
non-dict override files instead of returning {} silently, mirroring
_read_feature_flag_override_file. A user who saved a backup-config
edit but hit a permission error or wrote a corrupt file now gets
a log line instead of a silent revert to defaults.
- _atomic_write_json cleans up the .tmp file on OSError so a failed
write doesn't leave a partial sibling next to the real file
(parity with _save_feature_flags' inline tmp/rename block).
- Drop the duplicate inline _reset_global_settings import in
_save_feature_flags — it's already at module scope after the merge.1 parent cf18ad9 commit 65b9129
2 files changed
Lines changed: 58 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
599 | 599 | | |
600 | 600 | | |
601 | 601 | | |
602 | | - | |
603 | | - | |
604 | | - | |
605 | | - | |
606 | | - | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
607 | 619 | | |
| 620 | + | |
608 | 621 | | |
609 | 622 | | |
610 | | - | |
| 623 | + | |
| 624 | + | |
611 | 625 | | |
612 | | - | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
613 | 631 | | |
614 | 632 | | |
615 | | - | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
616 | 642 | | |
617 | 643 | | |
618 | | - | |
619 | | - | |
620 | 644 | | |
621 | 645 | | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
622 | 652 | | |
623 | | - | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
624 | 662 | | |
625 | 663 | | |
626 | 664 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
278 | 278 | | |
279 | 279 | | |
280 | 280 | | |
| 281 | + | |
| 282 | + | |
281 | 283 | | |
282 | 284 | | |
283 | | - | |
284 | | - | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
285 | 292 | | |
286 | 293 | | |
287 | 294 | | |
| |||
1924 | 1931 | | |
1925 | 1932 | | |
1926 | 1933 | | |
1927 | | - | |
1928 | 1934 | | |
1929 | 1935 | | |
1930 | 1936 | | |
| |||
0 commit comments