mirror of
https://github.com/openSUSE/osc.git
synced 2025-02-04 10:36:17 +01:00
Merge branch 'fix_600_osc-h_not_working_with_plugins' of https://github.com/lethliel/osc
python3 "workaround" for the quite fragile code in RawCmdln._help_preprocess: It depends on the "non-deterministic" order of preprocessor.items(). Hence, the results may differ on python2 and python3. The real fix is probably to enforce a fixed iteration order. See also the discussion in [1]. [1] https://github.com/openSUSE/osc/pull/604
This commit is contained in:
commit
63c103770a
@ -206,6 +206,20 @@ class Osc(cmdln.Cmdln):
|
||||
help_msg = cmdln.Cmdln._help_preprocess(self, help, cmdname)
|
||||
return help_msg % conf.config
|
||||
|
||||
def _help_preprocess_cmd_name(self, help, cmdname=None):
|
||||
if cmdname is None:
|
||||
return help
|
||||
return cmdln.Cmdln._help_preprocess_cmd_name(self, help, cmdname)
|
||||
|
||||
def _help_preprocess_cmd_option_list(self, help, cmdname=None):
|
||||
if cmdname is None:
|
||||
return help
|
||||
return cmdln.Cmdln._help_preprocess_cmd_option_list(self, help, cmdname)
|
||||
|
||||
def _help_preprocess_cmd_usage(self, help, cmdname=None):
|
||||
if cmdname is None:
|
||||
return help
|
||||
return cmdln.Cmdln._help_preprocess_cmd_usage(self, help, cmdname)
|
||||
|
||||
def do_init(self, subcmd, opts, project, package=None):
|
||||
"""${cmd_name}: Initialize a directory as working copy
|
||||
|
Loading…
Reference in New Issue
Block a user