parser, optiongroups = self._create_parser()
opts, args = parser.parse_args(list(argv))
# Filter out options from option groups
+ args = args[1:]
kwargs = dict(opts.__dict__)
for option_group in parser.option_groups:
for option in option_group.option_list:
del kwargs[option.dest]
kwargs.update(optiongroups)
- if len(args) < len(self.takes_args):
+ if len(args) != len(self.takes_args):
self.usage(args)
return -1
try:
return 1;
}
- py_cmd = PyDict_GetItemString(py_cmds, argv[1]);
+ py_cmd = PyDict_GetItemString(py_cmds, argv_new[1]);
if (py_cmd != NULL) {
rc = py_call_with_string_args(py_cmd, "_run",
- argc-2, argv+2);
+ argc-1, argv+1);
talloc_free(ev);
return rc;
}