From: Joshua Watt Date: Fri, 12 Jun 2020 21:50:16 +0000 (-0500) Subject: wic: Fix error message when reporting invalid offset X-Git-Tag: 2020-04.4-dunfell~115 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0ff25797126772f40e357a2f3cf81eccf659adaf;p=openembedded-core.git wic: Fix error message when reporting invalid offset The error message was reporting the calculated offset instead of the current offset, which made it confusing. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie (cherry picked from commit 2be775cfe1b49ce3889b5dc326e2b67a9667f18a) Signed-off-by: Steve Sakoman --- diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 1f65a7afe5..2f01999405 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -436,7 +436,7 @@ class PartitionedImage(): delta = offset - self.offset if delta < 0: - raise WicError("Could not place %s%s at offset %dK: next free sector is %d (delta: %d)" % (part.disk, self.numpart, part.offset, offset, delta)) + raise WicError("Could not place %s%s at offset %dK: next free sector is %d (delta: %d)" % (part.disk, self.numpart, part.offset, self.offset, delta)) logger.debug("Skipping %d sectors to place %s%s at offset %dK", delta, part.disk, self.numpart, part.offset)