Merge lp:~nmb/bzr/xdgconfigdir into lp:bzr
Proposed by
Neil Martinsen-Burrell
Status: | Merged |
---|---|
Merged at revision: | 5553 |
Proposed branch: | lp:~nmb/bzr/xdgconfigdir |
Merge into: | lp:bzr |
Diff against target: |
142 lines (+85/-1) 5 files modified
bzrlib/config.py (+18/-1) bzrlib/tests/test_config.py (+30/-0) doc/developers/xdg_config_spec.txt (+27/-0) doc/en/release-notes/bzr-2.3.txt (+3/-0) doc/en/whats-new/whats-new-in-2.3.txt (+7/-0) |
To merge this branch: | bzr merge lp:~nmb/bzr/xdgconfigdir |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Bennetts | Approve | ||
John A Meinel | Needs Fixing | ||
Review via email: mp+40888@code.launchpad.net |
Commit message
Support configuration files located in $XDG_CONFIG_
Description of the change
As discussed on the email list, this reads configuration files in $XDG_CONFIG_
To post a comment you must log in.
16 if not os.path. isdir(path) : dirname( path) isdir(parent_ dir): 'creating config parent directory: %r', parent_dir) parent_ dir) dirname( path) isdir(parent_ dir): 'creating config parent directory: %r', parent_dir) parent_ dir)
17 - if sys.platform == 'win32':
18 - parent_dir = os.path.
19 - if not os.path.
20 - trace.mutter(
21 - os.mkdir(
22 + parent_dir = os.path.
23 + if not os.path.
24 + trace.mutter(
25 + os.mkdir(
^- I think this breaks it for Windows. The path is "$APPDATA\ Bazaar\ 2.0\" so we have 2 levels of directories to create, and you removed one of them.
A possible fix is to have it use "os.makedirs()" instead.