Merge lp:~vila/bzr/552922-plugins-at into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ian Clatworthy | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5134 | ||||
Proposed branch: | lp:~vila/bzr/552922-plugins-at | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
181 lines (+68/-35) 3 files modified
NEWS (+4/-0) bzrlib/plugin.py (+27/-25) bzrlib/tests/test_plugins.py (+37/-10) |
||||
To merge this branch: | bzr merge lp:~vila/bzr/552922-plugins-at | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ian Clatworthy | Approve | ||
Gordon Tyler | Approve | ||
Review via email: mp+22697@code.launchpad.net |
Description of the change
Since https:/
was broken, I'm proposing against bzr.dev to get a reasonable diff,
but the intent is still to land in 2.2 when it will be updated.
This patch fixes the BZR_PLUGINS_AT handling to not depend on os.listdir() order.
The automated tests couldn't catch the problem and I was lucky enough to not encounter
it before (and neither was Gary).
Unlike _find_module_
names from the loadable files, BZR_PLUGINS_AT *knows* the plugin names and can (and should)
try some file names explicitly.
Tests added.
To post a comment you must log in.
This fixes the problem I was having in bug 552922.