Merge lp:~alejandrosantana/ocb-server/7.0-fix-dbfilter-ignored-in-config-file into lp:ocb-server

Proposed by Alejandro Santana
Status: Merged
Merged at revision: 5128
Proposed branch: lp:~alejandrosantana/ocb-server/7.0-fix-dbfilter-ignored-in-config-file
Merge into: lp:ocb-server
Diff against target: 11 lines (+1/-1)
1 file modified
openerp/tools/config.py (+1/-1)
To merge this branch: bzr merge lp:~alejandrosantana/ocb-server/7.0-fix-dbfilter-ignored-in-config-file
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Stefan Rijnhart (Opener) Approve
Pedro Manuel Baeza code review, no test Approve
Review via email: mp+192444@code.launchpad.net

Commit message

[FIX] Fix dbfilter ignored in config file. Simple fix never commited in official branch. https://bugs.launchpad.net/openobject-server/+bug/940439

Description of the change

[FIX] Fix dbfilter ignored in config file. Simple fix never commited in official branch. https://bugs.launchpad.net/openobject-server/+bug/940439
This way you can use a regular expression for 'dbfilter' variable in order to filter database names.

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Thank you for this one too.

Note that the same patch has been applied for 6.1:

https://code.launchpad.net/~alejandrosantana/ocb-server/6.1-fix-dbfilter-ignored-in-config-file/+merge/192442

Regards.

review: Approve (code review, no test)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

As per my review on the 6.1 proposal

review: Approve
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/tools/config.py'
2--- openerp/tools/config.py 2013-01-15 12:40:58 +0000
3+++ openerp/tools/config.py 2013-10-24 00:11:26 +0000
4@@ -154,7 +154,7 @@
5 # WEB
6 # TODO move to web addons after MetaOption merge
7 group = optparse.OptionGroup(parser, "Web interface Configuration")
8- group.add_option("--db-filter", dest="dbfilter", default='.*',
9+ group.add_option("--db-filter", dest="dbfilter", my_default='.*',
10 help="Filter listed database", metavar="REGEXP")
11 parser.add_option_group(group)
12