[MERGE] merged Julien Thewys branch to disallow unrecognized command line parameters.

bzr revid: vmt@openerp.com-20110418131023-mza0x2yo075xj0qb
This commit is contained in:
Vo Minh Thu 2011-04-18 15:10:23 +02:00
commit c2a752321b
1 changed files with 5 additions and 3 deletions

View File

@ -251,12 +251,14 @@ class configmanager(object):
self.parse_config()
def parse_config(self, args=[]):
opt = self.parser.parse_args(args)[0]
opt, args = self.parser.parse_args()
def die(cond, msg):
if cond:
print msg
sys.exit(1)
self.parser.error(msg)
# Ensures no illegitimate argument is silently discarded (avoids insidious "hyphen to dash" problem)
die(args, "unrecognized parameters: '%s'" % " ".join(args))
die(bool(opt.syslog) and bool(opt.logfile),
"the syslog and logfile options are exclusive")