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

[FW][FIX] conf.py: check odoo_dir is a real Odoo sources dir #1340

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Nov 26, 2021

In conf.py, we try to find a Odoo sources folder among odoo and ../odoo directories without really checking that they really are
Odoo sources folders, leading to doc generation error if it's not the case.

So, to improve that, this commit checks that the selected Odoo sources folder contains odoo-bin.

Forward-Port-Of: #1333

@fw-bot fw-bot requested a review from a team as a code owner November 26, 2021 11:33
@robodoo
Copy link
Collaborator

robodoo commented Nov 26, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 26, 2021

Ping @remybar, @AntoineVDV cherrypicking of pull request #1333 failed.

stderr:

12:33:08.535902 git.c:344               trace: built-in: git cherry-pick 0e96c53ceec0f8df137e3e40477b3802d329a0fa
error: could not apply 0e96c53c... [FIX] conf.py: check odoo_dir is a real Odoo sources dir
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

In `conf.py`, we try to find a Odoo sources folder among `odoo` and
`../odoo` directories without really checking that they really are
Odoo sources folders, leading to doc generation error if it's not the case.

So, to improve that, this commit checks that the selected Odoo sources folder
contains `odoo-bin`.

While we're at it, the logging is also improved to always display the
matching odoo sources' folder and version.

X-original-commit: f72e557
Co-authored-by: Antoine Vandevenne <[email protected]>
@AntoineVDV AntoineVDV force-pushed the 15.0-13.0-check_odoo_folder_contains_odoo_sources-bar-yNcv-fw branch from 9a8dcf9 to 1ab1f2d Compare November 29, 2021 10:54
@AntoineVDV
Copy link
Collaborator

@robodoo r+

@robodoo robodoo closed this in 57e1e31 Nov 29, 2021
@robodoo robodoo temporarily deployed to merge November 29, 2021 11:02 Inactive
@fw-bot fw-bot deleted the 15.0-13.0-check_odoo_folder_contains_odoo_sources-bar-yNcv-fw branch December 13, 2021 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants