diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-09-21 18:51:34 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-09-21 18:51:34 +0530 |
| commit | bf566331ea9cde73cc925b9d00bf307eecf607e9 (patch) | |
| tree | f40167394a4e97fe4ad8d3f477b6a961e68d7492 /bin/tools | |
| parent | 2889dd48cfddb7a21e1d15ac768c9a01957242ae (diff) | |
| parent | 6af5da11d14cdb41d3454ab9b395f86e6477fc93 (diff) | |
[MERGE]: Merge with lp:openobject-server
bzr revid: rpa@tinyerp.com-20100921132134-eb51fo5ueaoqxy12
Diffstat (limited to 'bin/tools')
| -rw-r--r-- | bin/tools/config.py | 5 | ||||
| -rw-r--r-- | bin/tools/misc.py | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/bin/tools/config.py b/bin/tools/config.py index a0554eb26ec..2964870d427 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -221,9 +221,6 @@ class configmanager(object): security = optparse.OptionGroup(parser, 'Security-related options') security.add_option('--no-database-list', action="store_false", dest='list_db', help="disable the ability to return the list of databases") - security.add_option('--enable-code-actions', action='store_true', - dest='server_actions_allow_code', default=False, - help='Enables server actions of state "code". Warning, this is a security risk.') parser.add_option_group(security) def parse_config(self): @@ -287,7 +284,7 @@ class configmanager(object): keys = [ 'language', 'translate_out', 'translate_in', 'debug_mode', 'smtp_ssl', 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', - 'list_db', 'server_actions_allow_code', 'xmlrpcs', + 'list_db', 'xmlrpcs', 'test_file', 'test_disable', 'test_commit', 'test_report_directory' ] diff --git a/bin/tools/misc.py b/bin/tools/misc.py index 2baf7c0c227..1256adb46f6 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -62,9 +62,7 @@ _logger = logging.getLogger('tools') def init_db(cr): import addons f = addons.get_module_resource('base', 'base.sql') - for line in file_open(f).read().split(';'): - if (len(line)>0) and (not line.isspace()): - cr.execute(line) + cr.execute(file_open(f).read()) cr.commit() for i in addons.get_modules(): |