On Tue, Jun 22, 2010 at 07:13:02PM +0200, Guido Trotter wrote: > On Tue, Jun 22, 2010 at 6:56 PM, Iustin Pop <[email protected]> wrote: > > On Tue, Jun 22, 2010 at 04:26:18PM +0200, Guido Trotter wrote: > >> On Wed, Jun 16, 2010 at 5:21 AM, Iustin Pop <[email protected]> wrote: > >> > The patch also modifies the internal methods in LUDiagnoseOS and gnt-os > >> > to deal with the format change of call_os_diagnose. > >> > --- > >> > lib/backend.py | 19 ++++++++++++++++++- > >> > lib/cmdlib.py | 14 ++++++++------ > >> > scripts/gnt-os | 2 +- > >> > 3 files changed, 27 insertions(+), 8 deletions(-) > >> > > >> > diff --git a/lib/backend.py b/lib/backend.py > >> > index 2a158d6..ba569ae 100644 > >> > --- a/lib/backend.py > >> > +++ b/lib/backend.py > >> > @@ -1781,6 +1781,7 @@ def DiagnoseOS(top_dirs=None): > >> > - status True/False is the validity of the OS > >> > - diagnose is the error message for an invalid OS, otherwise > >> > empty > >> > - variants is a list of supported OS variants, if any > >> > + - parameters is a list of (name, help) parameters, if any > >> > > >> > """ > >> > if top_dirs is None: > >> > @@ -1800,10 +1801,11 @@ def DiagnoseOS(top_dirs=None): > >> > if status: > >> > diagnose = "" > >> > variants = os_inst.supported_variants > >> > + parameters = os_inst.supported_parameters > >> > else: > >> > diagnose = os_inst > >> > variants = [] > >> > - result.append((name, os_path, status, diagnose, variants)) > >> > + result.append((name, os_path, status, diagnose, variants, > >> > parameters)) > >> > >> The append will fail if "parameters" is not defined (else case of the > >> if above). Please fix this. > > > > Uh, sorry. Interdiff: > > > > diff --git a/lib/backend.py b/lib/backend.py > > index ba569ae..1feb0da 100644 > > --- a/lib/backend.py > > +++ b/lib/backend.py > > @@ -1804,7 +1804,7 @@ def DiagnoseOS(top_dirs=None): > > parameters = os_inst.supported_parameters > > else: > > diagnose = os_inst > > - variants = [] > > + variants = parameters = [] > > Any reason to keep them on one line??
None, except that it's one line shorter? We're not reusing them except for return across the RPC, so no issue with shared modifications. iustin
