]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: Fix error message when reporting invalid offset
authorJoshua Watt <JPEWhacker@gmail.com>
Fri, 12 Jun 2020 21:50:16 +0000 (16:50 -0500)
committerSteve Sakoman <steve@sakoman.com>
Wed, 30 Sep 2020 15:52:01 +0000 (05:52 -1000)
The error message was reporting the calculated offset instead of the
current offset, which made it confusing.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2be775cfe1b49ce3889b5dc326e2b67a9667f18a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
scripts/lib/wic/plugins/imager/direct.py

index 1f65a7afe568d48486550f25c0a8a297aa080665..2f019994053acf05b6f7d8ecead92c62d76261f2 100644 (file)
@@ -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)