Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Still read config file from Library/Preferences if it exists #921

Merged
merged 1 commit into from
Jan 7, 2021

Conversation

glandium
Copy link
Collaborator

@glandium glandium commented Jan 6, 2021

Fixes #919

@glandium
Copy link
Collaborator Author

glandium commented Jan 6, 2021

@mstange Can you double check that this uses a config from ~/Library/Preferences if you move it back there?

@mstange
Copy link
Contributor

mstange commented Jan 6, 2021

I will check tomorrow.

Looking at the patch, I think that if both files are present, the patch prefers the one in Preferences. I think it would be better to prefer the one in the new location.

Copy link
Contributor

@mitchhentges mitchhentges left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but I agree with :mstange's suggestion on prioritizing our new config path first.

@mstange
Copy link
Contributor

mstange commented Jan 6, 2021

@mstange Can you double check that this uses a config from ~/Library/Preferences if you move it back there?

Confirmed, the patch works.

% cargo build --features "all native-zlib" --release
[...]
% mv ~/Library/Application\ Support/Mozilla.sccache/config ~/Library/Preferences/Mozilla.sccache/
% SCCACHE_LOG=trace ./target/release/sccache --dist-status
[...]
[2021-01-06T17:23:37Z DEBUG sccache::config] Attempting to read config file at "/Users/mstange/Library/Preferences/Mozilla.sccache/config"
[...]
{"SchedulerStatus":["http://192.168.2.146:10600/",{"num_servers":1,"num_cpus":16,"in_progress":0}]}%

src/config.rs Outdated Show resolved Hide resolved
src/config.rs Show resolved Hide resolved
@glandium glandium merged commit eb33f09 into mozilla:master Jan 7, 2021
@glandium glandium deleted the directories branch January 8, 2021 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Config file location on macOS changed in 0.2.14 and needs to be documented
4 participants