LGTM. Thanks, Jose
On May 22 14:56, 'Helga Velroyen' via ganeti-devel wrote: > This patch fixes the 'too many branches' lint error > in the lvmstrap tool. > > Signed-off-by: Helga Velroyen <[email protected]> > --- > tools/lvmstrap | 38 +++++++++++++++++++++++--------------- > 1 file changed, 23 insertions(+), 15 deletions(-) > > diff --git a/tools/lvmstrap b/tools/lvmstrap > index 47a710f..8e9f242 100755 > --- a/tools/lvmstrap > +++ b/tools/lvmstrap > @@ -823,6 +823,27 @@ def CreateVG(vgname, disks): > (vgname, " ".join(disks), result.output)) > > > +def _ComputeSysdFreeUsed(sysdisks): > + sysd_free = [] > + sysd_used = [] > + for name, _, _, parts, used in sysdisks: > + if used: > + sysd_used.append(name) > + for partname, _, _, partused in parts: > + if partused: > + sysd_used.append(partname) > + else: > + sysd_free.append(partname) > + else: > + sysd_free.append(name) > + > + if not sysd_free: > + raise PrereqError("no free disks found! (%d in-use disks)" % > + len(sysd_used)) > + > + return (sysd_free, sysd_used) > + > + > def ValidateDiskList(options): > """Validates or computes the disk list for create. > > @@ -840,22 +861,9 @@ def ValidateDiskList(options): > if not sysdisks: > raise PrereqError("no disks found (I looked for" > " non-removable block devices).") > - sysd_free = [] > - sysd_used = [] > - for name, _, _, parts, used in sysdisks: > - if used: > - sysd_used.append(name) > - for partname, _, _, partused in parts: > - if partused: > - sysd_used.append(partname) > - else: > - sysd_free.append(partname) > - else: > - sysd_free.append(name) > > - if not sysd_free: > - raise PrereqError("no free disks found! (%d in-use disks)" % > - len(sysd_used)) > + (sysd_free, sysd_used) = _ComputeSysdFreeUsed(sysdisks) > + > if options.alldisks: > disklist = sysd_free > elif options.disks: > -- > 1.9.1.423.g4596e3a > -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
