Interdiff: diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py index ebc30aa..4514dfe 100644 --- a/lib/cmdlib/cluster.py +++ b/lib/cmdlib/cluster.py @@ -59,7 +59,7 @@ from ganeti.cmdlib.common import _ShareAll, _RunPostHook, \ _ComputeIPolicyInstanceViolation, _AnnotateDiskParams, \ _SupportsOob
-import ganeti.masterd.instance # pylint: disable=W0611 +import ganeti.masterd.instance class LUClusterActivateMasterIp(NoHooksLU): Thanks, Thomas On Thu, May 16, 2013 at 5:58 PM, Bernardo Dal Seno <[email protected]>wrote: > On 16 May 2013 17:41, Thomas Thrainer <[email protected]> wrote: > > > > On Thu, May 16, 2013 at 4:52 PM, Bernardo Dal Seno <[email protected]> > > wrote: > >> > >> > diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py > >> > +import ganeti.masterd.instance # pylint: disable=W0611 > >> > >> Why this import? And why here? > > > > > > The import is actually used somewhere in the file ;). I have no idea why > > this singleton in imported all alone at the end of the import list, but > > ganeti.masterd.instance is always imported like this in Ganeti as far as > I > > have seen. > > True, but then the pylint warning should be left enabled (W0611 = > Unused import). > > > > Interdiff for the rest follows. During rebase, there were some cleanups > to > > make in other patches, but I guess I can omit sending those changes as > > well... > > LGTM, thanks. > > No one wants to review boring interdiffs due to previous interdiff, so > it's okay, thank you, and thank you for asking :-) Of corse, if there > are important changes, e.g. because a function changed signature, then > it's a different matter. > > 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
