[MERGE] forward port branch 10.0 up to 91a1448

3 files changed, 6 insertions, 2 deletions

diff --git a/odoo/cli/command.py b/odoo/cli/command.py
index fa22fd5baf1..75aa392fdfb 100644
--- a/odoo/cli/command.py
+++ b/odoo/cli/command.py
@@ -62,3 +62,5 @@ def main():
     if command in commands:
         o = commands[command]()
         o.run(args)
+    else:
+        sys.exit('Unknow command %r' % (command,))
diff --git a/odoo/cli/server.py b/odoo/cli/server.py
index da33c6888cd..afb172b7f3c 100644
--- a/odoo/cli/server.py
+++ b/odoo/cli/server.py
@@ -54,7 +54,9 @@ def report_configuration():
     This function assumes the configuration has been initialized.
     """
     config = odoo.tools.config
-    _logger.info("OpenERP version %s", __version__)
+    _logger.info("Odoo version %s", __version__)
+    if os.path.isfile(config.rcfile):
+        _logger.info("Using configuration file at " + config.rcfile)
     _logger.info('addons paths: %s', odoo.modules.module.ad_paths)
     host = config['db_host'] or os.environ.get('PGHOST', 'default')
     port = config['db_port'] or os.environ.get('PGPORT', 'default')
diff --git a/odoo/cli/shell.py b/odoo/cli/shell.py
index cf7b5ffbce2..6d0b0d5bd01 100644
--- a/odoo/cli/shell.py
+++ b/odoo/cli/shell.py
@@ -46,7 +46,7 @@ class Shell(Command):
             exec sys.stdin in local_vars
         else:
             if 'env' not in local_vars:
-                print 'No environment set, use `odoo.py shell -d dbname` to get one.'
+                print 'No environment set, use `%s shell -d dbname` to get one.' % sys.argv[0]
             for i in sorted(local_vars):
                 print '%s: %s' % (i, local_vars[i])