From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Fri, 5 Jun 2015 07:17:10 +0000 (+0300)
Subject: wic: Fix format string
X-Git-Tag: yocto-4.0~25667
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cae0473971ff3983c7e423c23215b342c7dad1d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

wic: Fix format string

wic crashes with "TypeError: %d format: a number is required, not str"
Due to incorrect format used for Wic_PartData.extra_size attribute.
Using %s instead of %d should fix the crash.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index f3c5545789c..40c27729149 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -71,7 +71,7 @@ class Wic_PartData(Mic_PartData):
             retval += " --no-table"
         if self.use_uuid:
             retval += " --use-uuid"
-        retval += " --extra-space=%d" % self.extra_space
+        retval += " --extra-space=%s" % self.extra_space
         retval += " --overhead-factor=%f" % self.overhead_factor
 
         return retval