summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/utils/partitionedfs.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-04 16:06:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 23:05:14 +0100
commit5f06463c6c23f337147457dd9e490887ac194db4 (patch)
tree2b57f3302332400e8bf9c8525218c1d6fd520b22 /scripts/lib/wic/utils/partitionedfs.py
parentbc89dc4225904692882888bbe8feaee6e9c46120 (diff)
downloadpoky-5f06463c6c23f337147457dd9e490887ac194db4.tar.gz
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] (From OE-Core rev: 997ff239bd753a7957cc14c6829b2f093d9bcef6) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/utils/partitionedfs.py')
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 8f4db4e17d..46b5d345c7 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -95,7 +95,7 @@ class Image():
95 ks_pnum = len(self.partitions) 95 ks_pnum = len(self.partitions)
96 96
97 # Converting kB to sectors for parted 97 # Converting kB to sectors for parted
98 size = size * 1024 / self.sector_size 98 size = size * 1024 // self.sector_size
99 99
100 part = {'ks_pnum': ks_pnum, # Partition number in the KS file 100 part = {'ks_pnum': ks_pnum, # Partition number in the KS file
101 'size': size, # In sectors 101 'size': size, # In sectors
@@ -173,12 +173,12 @@ class Image():
173 # gaps we could enlargea the previous partition? 173 # gaps we could enlargea the previous partition?
174 174
175 # Calc how much the alignment is off. 175 # Calc how much the alignment is off.
176 align_sectors = disk['offset'] % (part['align'] * 1024 / self.sector_size) 176 align_sectors = disk['offset'] % (part['align'] * 1024 // self.sector_size)
177 177
178 if align_sectors: 178 if align_sectors:
179 # If partition is not aligned as required, we need 179 # If partition is not aligned as required, we need
180 # to move forward to the next alignment point 180 # to move forward to the next alignment point
181 align_sectors = (part['align'] * 1024 / self.sector_size) - align_sectors 181 align_sectors = (part['align'] * 1024 // self.sector_size) - align_sectors
182 182
183 msger.debug("Realignment for %s%s with %s sectors, original" 183 msger.debug("Realignment for %s%s with %s sectors, original"
184 " offset %s, target alignment is %sK." % 184 " offset %s, target alignment is %sK." %