[Libguestfs] [PATCH] v2v: rhv-plugin: Use string literal concatenation

[Nir Soffer]

On Mon, Aug 6, 2018 at 11:02 AM Richard W.M. Jones <rjones at redhat.com>
wrote:

> On Sun, Aug 05, 2018 at 04:37:31PM +0300, Nir Soffer wrote:
> > When splitting long strings over multiple lines, we can use string
> > literal concatenation instead of +.
> >
> > See
> https://docs.python.org/3/reference/lexical_analysis.html#string-literal-concatenation
> > ---
> >  .gnulib                  |  2 +-
>
> I dropped the accidental gnulib part of this commit :-)
>

Sorry about that :-)

I think I did:
git pull
git checkout -b ...
edit file
git commit
git format-patch master

Can we prevent submodules changes to sneak into unrelated patches
without manual work on the developer side?


>
> Rich.
>
> >  v2v/rhv-upload-plugin.py | 14 +++++++-------
> >  2 files changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/.gnulib b/.gnulib
> > index 5b78831df..646a44e1b 160000
> > --- a/.gnulib
> > +++ b/.gnulib
> > @@ -1 +1 @@
> > -Subproject commit 5b78831df03b49408676227604cf16f90dee07ac
> > +Subproject commit 646a44e1b190c4a7f6a9f32c63230c619e38d251
> > diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py
> > index bdc1e104a..2d686c2da 100644
> > --- a/v2v/rhv-upload-plugin.py
> > +++ b/v2v/rhv-upload-plugin.py
> > @@ -95,8 +95,8 @@ def find_host(connection):
> >          # - 'hw_id' equals to 'vdsm_id'
> >          # - Its status is 'Up'
> >          # - Belongs to the storage domain's datacenter
> > -        debug("cannot find a running host with hw_id=%r, " +
> > -              "that belongs to datacenter '%s', " +
> > +        debug("cannot find a running host with hw_id=%r, "
> > +              "that belongs to datacenter '%s', "
> >                "using any host" % (vdsm_id, datacenter.name))
> >          return None
> >
> > @@ -193,15 +193,15 @@ def open(readonly):
> >          if transfer.phase != types.ImageTransferPhase.INITIALIZING:
> >              break
> >          if time.time() > endt:
> > -            raise RuntimeError("timed out waiting for transfer status "
> +
> > +            raise RuntimeError("timed out waiting for transfer status "
> >                                 "!= INITIALIZING")
> >
> >      # Now we have permission to start the transfer.
> >      if params['rhv_direct']:
> >          if transfer.transfer_url is None:
> > -            raise RuntimeError("direct upload to host not supported, " +
> > -                               "requires ovirt-engine >= 4.2 and only
> works " +
> > -                               "when virt-v2v is run within the
> oVirt/RHV " +
> > +            raise RuntimeError("direct upload to host not supported, "
> > +                               "requires ovirt-engine >= 4.2 and only
> works "
> > +                               "when virt-v2v is run within the
> oVirt/RHV "
> >                                 "environment, eg. on an oVirt node.")
> >          destination_url = urlparse(transfer.transfer_url)
> >      else:
> > @@ -511,7 +511,7 @@ def close(h):
> >                  time.sleep(1)
> >                  tmp = transfer_service.get()
> >                  if time.time() > endt:
> > -                    raise RuntimeError("timed out waiting for transfer
> " +
> > +                    raise RuntimeError("timed out waiting for transfer "
> >                                         "to finalize")
> >          except sdk.NotFoundError:
> >              pass
> > --
> > 2.17.1
>
> --
> Richard Jones, Virtualization Group, Red Hat
> http://people.redhat.com/~rjones
> Read my programming and virtualization blog: http://rwmj.wordpress.com
> virt-builder quickly builds VMs from scratch
> http://libguestfs.org/virt-builder.1.html
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20180806/18c77fc8/attachment.htm>