Skip to content

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

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

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

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 <anv@odoo.com>
@fw-bot fw-bot requested a review from a team as a code owner November 26, 2021 11:30
@robodoo
Copy link
Collaborator

robodoo commented Nov 26, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 26, 2021

This PR targets 14.0 and is part of the forward-port chain. Further PRs will be created up to master.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 26, 2021

Ping @remybar, @AntoineVDV
The next pull request (#1340) is in conflict. You can merge the chain up to here by saying

@fw-bot r+

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@AntoineVDV
Copy link
Collaborator

@fw-bot r+

robodoo pushed a commit that referenced this pull request 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`.

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

closes #1339

X-original-commit: f72e557
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Co-authored-by: Antoine Vandevenne <anv@odoo.com>
@robodoo robodoo closed this Nov 26, 2021
@robodoo robodoo temporarily deployed to merge November 26, 2021 12:56 Inactive
@fw-bot fw-bot deleted the 14.0-13.0-check_odoo_folder_contains_odoo_sources-bar-U-5V-fw branch December 10, 2021 13:47
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