Merge lp:~jelmer/bzr/config-file-permdenied into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6117 |
Proposed branch: | lp:~jelmer/bzr/config-file-permdenied |
Merge into: | lp:bzr |
Diff against target: |
143 lines (+60/-8) 3 files modified
bzrlib/config.py (+14/-4) bzrlib/tests/test_config.py (+42/-4) doc/en/release-notes/bzr-2.5.txt (+4/-0) |
To merge this branch: | bzr merge lp:~jelmer/bzr/config-file-permdenied |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Needs Fixing | ||
Review via email:
|
Commit message
Print a warning rather than an error when the current user does not have permission to read a configuration file.
Description of the change
If the current user is not allowed to read a configuration file,
warn and continue without it rather than raising an exception.
To post a comment you must log in.
store.load() is used both for reading a config file and before saving it, the behavior should be different.
I've tweaked your submission at lp:~vila/bzr/config-file-permdenied
Also, I think configobj use os.path.isfile and as such should be immune to the issue, but your patch doesn't hurt either so let's land that.