7187287 Bug 7163694 fixes in gui-install/disk_screen.py are removed due to mismerge b/w bug 7163694 &7183018 S11U1Build22
authorswati sarraf <swati.sarraf@oracle.com>
Mon, 30 Jul 2012 09:46:11 -0700
changeset 1758 ecfb8c75e5a4
parent 1757 516547d73c1b
child 1759 5aaebb87ff6f
7187287 Bug 7163694 fixes in gui-install/disk_screen.py are removed due to mismerge b/w bug 7163694 &7183018
usr/src/cmd/gui-install/src/disk_screen.py
--- a/usr/src/cmd/gui-install/src/disk_screen.py	Wed Jul 25 09:41:04 2012 -0700
+++ b/usr/src/cmd/gui-install/src/disk_screen.py	Mon Jul 30 09:46:11 2012 -0700
@@ -36,6 +36,7 @@
 import glib
 import gobject
 import gtk
+from math import ceil 
 
 import osol_install.errsvc as errsvc
 import osol_install.liberrsvc as liberrsvc
@@ -712,12 +713,14 @@
             # Blank out the size values until they are available
             size_str = size_str.replace('%s', '')
         else:
-            rec_size = locale.format('%.1f',
-                self._target_controller.recommended_target_size.get(
-                    units=Size.gb_units))
-            min_size = locale.format('%.1f',
-                self._target_controller.minimum_target_size.get(
-                    units=Size.gb_units))
+            rec_orig = self._target_controller.recommended_target_size.get(
+                units=Size.gb_units)
+            rec_roundup = (ceil(rec_orig * 10)) * 0.1 
+            rec_size = locale.format('%.1f', rec_roundup)
+            min_orig = self._target_controller.minimum_target_size.get(
+                units=Size.gb_units)
+            min_roundup = (ceil(min_orig * 10)) * 0.1 
+            min_size = locale.format('%.1f', min_roundup)
             size_str = size_str % (rec_size, min_size)
 
         self.set_titles(_("Disk Selection"),