[FW][FIX] conf.py: check odoo_dir is a real Odoo sources dir #1341
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ping @remybar, @AntoineVDV cherrypicking of pull request #1333 failed. stderr: 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: 57e1e31 Co-authored-by: Antoine Vandevenne <anv@odoo.com>
AntoineVDV
force-pushed
the
master-13.0-check_odoo_folder_contains_odoo_sources-bar-oB9m-fw
branch
from
4cde683 to
65e8bc8
Compare
|
@robodoo r+ |
robodoo
pushed a commit
that referenced
this pull request
Nov 29, 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 #1341 X-original-commit: 57e1e31 Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com> Co-authored-by: Antoine Vandevenne <anv@odoo.com>
fw-bot
deleted the
master-13.0-check_odoo_folder_contains_odoo_sources-bar-oB9m-fw
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
conf.py, we try to find a Odoo sources folder amongodooand../odoodirectories without really checking that they really areOdoo 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: #1340
Forward-Port-Of: #1333