mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: rhv-plugin: Use string literal concatenation

Browse Source 
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
This commit is contained in:
Nir Soffer
2018-08-05 16:37:31 +03:00
committed by Richard W.M. Jones
parent 8f4a8ae71c
commit c4a0d64f63
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
v2v/rhv-upload-plugin.py
View File

@@ -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