Interdiff (kind of hard to read, because it's a diff to the previous diff where the previous interdiff is already applied... But it's just sorted imports):
diff --git a/lib/cmdlib/query.py b/lib/cmdlib/query.py index 566edcb..9ffc4d8 100644 --- a/lib/cmdlib/query.py +++ b/lib/cmdlib/query.py @@ -25,13 +25,13 @@ from ganeti import constants from ganeti import errors from ganeti import query from ganeti.cmdlib import _ExtStorageQuery -from ganeti.cmdlib import _OsQuery from ganeti.cmdlib.backup import _ExportQuery from ganeti.cmdlib.base import NoHooksLU from ganeti.cmdlib.cluster import _ClusterQuery from ganeti.cmdlib.group import _GroupQuery from ganeti.cmdlib.instance import _InstanceQuery from ganeti.cmdlib.network import _NetworkQuery +from ganeti.cmdlib.node import _NodeQuery from ganeti.cmdlib.operating_system import _OsQuery On Thu, May 16, 2013 at 6:53 PM, Bernardo Dal Seno <[email protected]>wrote: > On 16 May 2013 10:23, Thomas Thrainer <[email protected]> wrote: > > All LUOs* classes are extracted to operating_system.py. > > > > Signed-off-by: Thomas Thrainer <[email protected]> > > --- > > Makefile.am | 1 + > > lib/cmdlib/__init__.py | 162 +---------------------------------- > > lib/cmdlib/operating_system.py | 189 > +++++++++++++++++++++++++++++++++++++++++ > > lib/cmdlib/query.py | 2 +- > > 4 files changed, 192 insertions(+), 162 deletions(-) > > create mode 100644 lib/cmdlib/operating_system.py > > > > diff --git a/Makefile.am b/Makefile.am > > index da01b58..9a36e4d 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -318,6 +318,7 @@ cmdlib_PYTHON = \ > > lib/cmdlib/instance_utils.py \ > > lib/cmdlib/backup.py \ > > lib/cmdlib/query.py \ > > + lib/cmdlib/operating_system.py \ > > Please keep it sorted. > > > diff --git a/lib/cmdlib/query.py b/lib/cmdlib/query.py > > index ec5051d..581f08b 100644 > > --- a/lib/cmdlib/query.py > > +++ b/lib/cmdlib/query.py > > @@ -30,8 +30,8 @@ from ganeti.cmdlib.group import _GroupQuery > > from ganeti.cmdlib.node import _NodeQuery > > from ganeti.cmdlib.instance import _InstanceQuery > > from ganeti.cmdlib.backup import _ExportQuery > > +from ganeti.cmdlib.operating_system import _OsQuery > > from ganeti.cmdlib.network import _NetworkQuery > > -from ganeti.cmdlib import _OsQuery > > from ganeti.cmdlib import _ExtStorageQuery > > Same here :) > > Rest LGTM, thanks. > Bernardo > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Katherine Stephens
