Merge lp:~donkirkby/openobject-server/config-defaults into lp:openobject-server/5.0
Status: | Rejected |
---|---|
Rejected by: | Olivier Dony (Odoo) |
Proposed branch: | lp:~donkirkby/openobject-server/config-defaults |
Merge into: | lp:openobject-server/5.0 |
Diff against target: |
289 lines (+96/-64) 1 file modified
bin/tools/config.py (+96/-64) |
To merge this branch: | bzr merge lp:~donkirkby/openobject-server/config-defaults |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Dony (Odoo) | Needs Resubmitting | ||
Mantavya Gajjar (Open ERP) | Pending | ||
Xavier (Open ERP) | Pending | ||
Stephane Wirtel (OpenERP) | Pending | ||
Jay Vora (Serpent Consulting Services) | Pending | ||
Review via email: mp+19066@code.launchpad.net |
Commit message
Make all configuration options available on command line and in configuration file as discussed in bug lp:392114
Unmerged revisions
- 1955. By Don Kirkby
-
[MERGE] release 5.0.15 from branch 5.0
- 1954. By Don Kirkby
-
merge 5.0.9 from 5.0 branch
- 1953. By Don <don@don-desktop-openerp>
-
Remove debug code that I added in revision 1949.
- 1952. By Don <don@don-desktop-openerp>
-
Remove default values of None. Add some options to the command line that were only available in config files. Convert some parameters to strings for backward compatibility. Save translate_modules as comma separated list without brackets or quotes.
- 1951. By Don <don@don-desktop-openerp>
-
copy all options from OptionParser to config.options
- 1950. By Don <don@don-desktop-openerp>
-
move all default values from the option definitions to a dictionary called defaults.
- 1949. By Don <don@don-desktop-openerp>
-
some debug code to dump the contents of tools.config.
options (I'll remove it before making a merge proposal)
This is the work that I proposed in the bug discussion. I have tested it with all the options described in the code, and compared the in-memory values to those generated by
the old code. I also compared the configuration files saved by my new code and the old code.
In addition to adding support for all options in the configuration file and the command line, the following behaviours have changed:
- The reference to the soap option had been commented out from openerp-server.py and it wasn't allowed on the command line, so I removed it from the defaults.
- translate_modules now reads and writes to the configuration file in the same format that it uses on the command line. If it sees the old format, it continues to ignore it
during load, just like the old code did.
- netport and port used to be strings when loaded from a configuration file, and integers when loaded from the command line. They are now always integers.
- demo is no longer saved to the configuration file. (It was ignored during load, so this should be irrelevant.)
I did not get around to adding new names for the command line options that don't match their names in the configuration file.
I tried to break up the changes into smaller revisions to make the review easier. If there's something I can do to make my next proposal easier to review, please let me know.