Merge lp://staging/~therp-nl/anybox.recipe.openerp/jbaudoux-relative_paths_explicit_jailroot_support into lp://staging/~jbaudoux/anybox.recipe.openerp/20130908_relative_paths
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~therp-nl/anybox.recipe.openerp/jbaudoux-relative_paths_explicit_jailroot_support |
| Merge into: | lp://staging/~jbaudoux/anybox.recipe.openerp/20130908_relative_paths |
| Prerequisite: | lp://staging/~therp-nl/anybox.recipe.openerp/jbaudoux-relative_paths_resolve_conflict |
| Diff against target: |
200 lines (+91/-22) 3 files modified
anybox/recipe/openerp/base.py (+38/-0) anybox/recipe/openerp/server.py (+20/-22) doc/configuration.rst (+33/-0) |
| To merge this branch: | bzr merge lp://staging/~therp-nl/anybox.recipe.openerp/jbaudoux-relative_paths_explicit_jailroot_support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jacques-Etienne Baudoux | test & code review | Needs Fixing | |
| Anybox | Pending | ||
| Therp | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch allows the creation of a buildout that can be moved to a jail root and run OpenERP in that jail root without any modifications to any of the files in the buildout.
Please notice the target branch: this proposal is a continuation of the work by Jacques-Etienne Baudoux.
- Apply the use of _relativitize in recent changes in the target branch.
- Add explicit support for jail root in the buildout.cfg [openerp] section, which will update the addons-paths.
- Also allow specification of a portable python executable or the python executable in the jail root, to be put in the generated scripts' she-bangs.
For clarity, an update of the original branch by mr. Baudoux with the series branch of the project has been delegated to the prerequisite branch. I'll leave that branch in WIP state, as I don't believe it really needs a separate review.
| Jacques-Etienne Baudoux (jbaudoux) wrote | # |
Unmerged revisions
- 430. By Stefan Rijnhart (Opener)
-
[FIX] Remove call to debugger
- 429. By Stefan Rijnhart (Opener)
-
[FIX] Terminology
- 428. By Stefan Rijnhart (Opener)
-
[IMP] Comment
- 427. By Stefan Rijnhart (Opener)
-
[FIX] Typo
- 426. By Stefan Rijnhart (Opener)
-
[RFR] Terminology
- 425. By Stefan Rijnhart (Opener)
-
[RFR] Make _relative_path available in both base.py and server.py
[ADD] Adapt addons paths to explicit jail root location
[ADD] Option to specify target python executable - 424. By Stefan Rijnhart (Opener)
-
[MRG] Update with target branch
Hello Stefan,
I tried your latest branch lp:~therp-nl/anybox.recipe.openerp/8.2-jbaudoux-relative_paths_explicit_jailroot_support to test the jailroot.
It's not clear for me what you expect in the new "jailroot-
When instanciating Session, it's not clear to me what is expected as root path. Seems only used to find a VERSION.txt file that I can't find anyway.
| "session = Session(%s, %r)" % (
|| self._relativit
|| self.jailroot_
When deploying from /root into /root/jailroot, do you expect jailroot-
In the later case, that path was already deducted in the method _relativitize in server.py without having to define a new variable.
At the moment, your changes do not work with my current setup. If you can clarify your approach, I'm willing to refactor your MP to make it work with my setup against latest 1.8 serie. I'd be happy to finalize this branch and get it merged.