wic: use // operator instead of /

Division operator works differently in Python 3. It results in
float unlike in Python 2, where it results in int.
Explicitly used "floor division" operator instead of 'division'
operator. This should make the code to result in integer under
both pythons.

[YOCTO #9412]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index f8b2ba71bbd94e25513603431fc4ac03328aa269..2778be5e1b5ce62f5768551754097c4dedf00f99 100644 (file)
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -95,7 +95,7 @@ class _FilemapBase(object):
                         % (self._image_path, err))
 
         self.blocks_cnt = self.image_size + self.block_size - 1
-        self.blocks_cnt /= self.block_size
+        self.blocks_cnt //= self.block_size
 
         try:
             self._f_image.flush()
@@ -254,7 +254,7 @@ class FilemapSeek(_FilemapBase):
         if offs == -1:
             result = False
         else:
-            result = (offs / self.block_size == block)
+            result = (offs // self.block_size == block)
 
         self._log.debug("FilemapSeek: block_is_mapped(%d) returns %s"
                         % (block, result))
@@ -286,8 +286,8 @@ class FilemapSeek(_FilemapBase):
             if end > limit:
                 end = limit
 
-            start_blk = start / self.block_size
-            end_blk = end / self.block_size - 1
+            start_blk = start // self.block_size
+            end_blk = end // self.block_size - 1
             self._log.debug("FilemapSeek: yielding range (%d, %d)"
                             % (start_blk, end_blk))
             yield (start_blk, end_blk)
@@ -351,7 +351,7 @@ class FilemapFiemap(_FilemapBase):
 
         # Calculate how many 'struct fiemap_extent' elements fit the buffer
         self._buf_size -= _FIEMAP_SIZE
-        self._fiemap_extent_cnt = self._buf_size / _FIEMAP_EXTENT_SIZE
+        self._fiemap_extent_cnt = self._buf_size // _FIEMAP_EXTENT_SIZE
         assert self._fiemap_extent_cnt > 0
         self._buf_size = self._fiemap_extent_cnt * _FIEMAP_EXTENT_SIZE
         self._buf_size += _FIEMAP_SIZE
@@ -456,11 +456,11 @@ class FilemapFiemap(_FilemapBase):
                 # Start of the extent
                 extent_start = fiemap_extent[0]
                 # Starting block number of the extent
-                extent_block = extent_start / self.block_size
+                extent_block = extent_start // self.block_size
                 # Length of the extent
                 extent_len = fiemap_extent[2]
                 # Count of blocks in the extent
-                extent_count = extent_len / self.block_size
+                extent_count = extent_len // self.block_size
 
                 # Extent length and offset have to be block-aligned
                 assert extent_start % self.block_size == 0

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 8f4db4e17d25390c876f74f59f83d8d085f11ec9..46b5d345c724be25733714500cf0a3a9afe2e2db 100644 (file)
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -95,7 +95,7 @@ class Image():
         ks_pnum = len(self.partitions)
 
         # Converting kB to sectors for parted
-        size = size * 1024 / self.sector_size
+        size = size * 1024 // self.sector_size
 
         part = {'ks_pnum': ks_pnum, # Partition number in the KS file
                 'size': size, # In sectors
@@ -173,12 +173,12 @@ class Image():
                 # gaps we could enlargea the previous partition?
 
                 # Calc how much the alignment is off.
-                align_sectors = disk['offset'] % (part['align'] * 1024 / self.sector_size)
+                align_sectors = disk['offset'] % (part['align'] * 1024 // self.sector_size)
 
                 if align_sectors:
                     # If partition is not aligned as required, we need
                     # to move forward to the next alignment point
-                    align_sectors = (part['align'] * 1024 / self.sector_size) - align_sectors
+                    align_sectors = (part['align'] * 1024 // self.sector_size) - align_sectors
 
                     msger.debug("Realignment for %s%s with %s sectors, original"
                                 " offset %s, target alignment is %sK." %