Interdiff:
diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index dee671a..466c53c 100644
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -236,9 +236,10 @@ def _InitGanetiServerSetup(master_name, cfg):
cfg.Update(cfg.GetClusterInfo(), logging.error)
ssconf.WriteSsconfFiles(cfg.GetSsconfValues())
- if not os.path.exists(os.path.join(pathutils.DATA_DIR, "%s%s" %
- (constants.SSCONF_FILEPREFIX,
- constants.SS_MASTER_CANDIDATES_CERTS))):
+ if not os.path.exists(
+ os.path.join(pathutils.DATA_DIR,
+ "%s%s" % (constants.SSCONF_FILEPREFIX,
+ constants.SS_MASTER_CANDIDATES_CERTS))):
raise errors.OpExecError("Ssconf file for master candidate
certificates"
" was not written.")
On Mon, Aug 3, 2015 at 11:14 AM, Klaus Aehlig <[email protected]> wrote:
> On Mon, Aug 03, 2015 at 11:08:11AM +0200, 'Lisa Velden' via ganeti-devel
> wrote:
> > to satisfy pylint.
> >
> > Signed-off-by: Lisa Velden <[email protected]>
> > ---
> > lib/bootstrap.py | 7 +++----
> > 1 file changed, 3 insertions(+), 4 deletions(-)
>
> If this makes pylint happy, then LGTM.
>
> However, I'm a bit surprised, as...
>
> > - if not os.path.exists(
> > - os.path.join(pathutils.DATA_DIR,
> > - "%s%s" % (constants.SSCONF_FILEPREFIX,
> > - constants.SS_MASTER_CANDIDATES_CERTS))):
> > + if not os.path.exists(os.path.join(pathutils.DATA_DIR, "%s%s" %
> > + (constants.SSCONF_FILEPREFIX,
> > + constants.SS_MASTER_CANDIDATES_CERTS))):
> > raise errors.OpExecError("Ssconf file for master candidate
> certificates"
>
> ...the if-line opens two parenthesis, however you indent only relative
> to the first of those. That seems a bit like exploiting a bug in pylint.
>
> --
> Klaus Aehlig
> Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
>
--
Lisa Velden
Software Engineer
[email protected]
Google Germany GmbH
Dienerstraße 12
80331 München
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
