Commit 199cac7
authored
The new relocatable cache file work uses simple text substitution when
stripping out the depot from a cache file's paths, and when substituting
it in again over the `@depot` marker. However, if a user starts julia
with `JULIA_DEPOT_PATH=/opt/foo/`, the embedded path for `Foo.jl`'s
includes list will look like `@depotpackages/Foo/XYZ/src/Foo.jl`, and if
the user then uses `JULIA_DEPOT_PATH=/opt/foo` (which should be
equivalent) the cache file will fail to load with the message:
```
Failed to determine depot from srctext files
```
This commit standardizes the serialization format to always contain a
trailing `pathsep()`, so that textual substitution is more likely to
work regardless of slightly-inconsistent `JULIA_DEPOT_PATH` settings.
1 parent 8382d51 commit 199cac7
2 files changed
+11
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2600 | 2600 | | |
2601 | 2601 | | |
2602 | 2602 | | |
| 2603 | + | |
| 2604 | + | |
| 2605 | + | |
| 2606 | + | |
| 2607 | + | |
| 2608 | + | |
| 2609 | + | |
2603 | 2610 | | |
2604 | | - | |
| 2611 | + | |
2605 | 2612 | | |
2606 | 2613 | | |
2607 | 2614 | | |
| |||
2619 | 2626 | | |
2620 | 2627 | | |
2621 | 2628 | | |
2622 | | - | |
| 2629 | + | |
2623 | 2630 | | |
2624 | 2631 | | |
2625 | 2632 | | |
| |||
2725 | 2732 | | |
2726 | 2733 | | |
2727 | 2734 | | |
2728 | | - | |
| 2735 | + | |
2729 | 2736 | | |
2730 | 2737 | | |
2731 | 2738 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| |||
0 commit comments