Fix output decoration

pym/cl_distr.py

@@ -550,7 +550,6 @@ class MultiPartitions:
 
 
 class PartitionDistributive(Distributive):
-    # TODO: need node value for ext2 ext3
     formatUtilities = { 'ext2':'/sbin/mkfs.ext2 %s',
                         'ext3':'/sbin/mkfs.ext3 %s',
                         'ext4':'/sbin/mkfs.ext4 %s',

pym/cl_install.py

@@ -589,7 +589,7 @@ class cl_install(color_print):
         self.listDisksOptions = []
         self.listBindsOptions = []
         self.listSwapsOptions = []
-        self.startMessage = False
+        self.startMessage = ""
         Spinner().setWriteFunc(self.defaultPrint)
 
     def colorPrint(self,*argv,**kwarg):
@@ -1148,21 +1148,28 @@ class cl_install(color_print):
         """Print waiting message and OK or Error by func result"""
         message = "%s ..." % message
         self.printSUCCESS(message,printBR=False)
-        self.printRight(self.lenString(message)+5,4)
+        self.startMessage = message
-        self.startMessage = True
 
     def printByResult(self,result,failMessage=None):
-        if result:
+        if self.startMessage:
-            self.printLine((('blueBr','['),
+            self.defaultPrint("\r")
-                            ('greenBr',' ok '),
+            self.printLine((('greenBr',' * '),
-                            ('blueBr',']')),[])
+                            ('',self.startMessage),
-        else:
+                           ),
-            self.printLine((('blueBr','['),
+                           (('',''),
-                            ('redBr',' !! '),
+                           ), 0, False)
-                            ('blueBr',']')),[])
+            self.printRight(self.lenString(self.startMessage)+5,4)
-            if failMessage:
+            if result:
-                self.printERROR(failMessage)
+                self.printLine((('blueBr','['),
-        self.startMessage = False
+                                ('greenBr',' ok '),
+                                ('blueBr',']')),[])
+            else:
+                self.printLine((('blueBr','['),
+                                ('redBr',' !! '),
+                                ('blueBr',']')),[])
+                if failMessage:
+                    self.printERROR(failMessage)
+            self.startMessage = ""
 
     def setupOpenGL(self):
         defaultGL = "xorg-x11"
@@ -1360,14 +1367,12 @@ the system") + " (yes/no)"
 
 
                 # install distributive
-                distrCopy = True
+                self.printMessageForTest(
-                self.printSUCCESS("%s ... "%
+                    _("Unpacking system image into target"))
-                    _("Unpacking system image into target"),printBR=False)
+                self.defaultPrint(" ")
                 self.clVars.Get('os_grub_conf')
                 targetDistr.installFrom(sourceDistr)
-                self.defaultPrint('\n')
+                self.printByResult(True)
-                distrCopy = False
-                self.printSUCCESS("Unpacking complete")
 
                 # join templates
                 self.printMessageForTest(_("Updating config"))
@@ -1404,19 +1409,11 @@ the system") + " (yes/no)"
             for i in apply(traceback.format_exception, sys.exc_info()):
                 error += i
         except KeyboardInterrupt,e:
-            if self.startMessage:
+            self.printByResult(False)
-                self.defaultPrint("\b\b")
-                self.printByResult(False)
-            if distrCopy:
-                distrCopy = False
-                self.defaultPrint("\n")
             self.printWARNING("Interrupting the installation")
             error = _("Installation manually interrupt")
-        if self.startMessage:
+        if error:
             self.printByResult(False)
-        if distrCopy:
-            distrCopy = False
-            self.defaultPrint("\n")
         try:
             if self.clTempl:
                 self.clTempl.closeFiles()
@@ -1432,7 +1429,7 @@ the system") + " (yes/no)"
             error = "%s\n%s" % (str(error),_("Unmounting error"))
         except KeyboardInterrupt,e:
             pass
-        if self.startMessage:
+        if error:
             self.printByResult(False)
         if error:
             for line in filter(lambda x: x,str(error).split('\n')):