Merge lp:~yann-papouin/ocb-addons/6.1-bug-1008513-dav-import-error into lp:ocb-addons/6.1
Proposed by
Yann Papouin
Status: | Merged |
---|---|
Merged at revision: | 6847 |
Proposed branch: | lp:~yann-papouin/ocb-addons/6.1-bug-1008513-dav-import-error |
Merge into: | lp:ocb-addons/6.1 |
Diff against target: |
90 lines (+31/-14) 3 files modified
document_webdav/dav_fs.py (+11/-5) document_webdav/webdav.py (+9/-4) document_webdav/webdav_server.py (+11/-5) |
To merge this branch: | bzr merge lp:~yann-papouin/ocb-addons/6.1-bug-1008513-dav-import-error |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stefan Rijnhart (Opener) | Approve | ||
Pedro Manuel Baeza | code review | Approve | |
Review via email: mp+219794@code.launchpad.net |
Description of the change
Backport from 7.0 needed to run OpenERP 6.1 with DAV support on latest Linux distribution
To post a comment you must log in.
I think you may keep osv.except_osv in case both imports fail, or put an external dependency on manifest.
Regards.