Fix detect live image in iso. Fix text decorations.

pym/cl_distr.py

@@ -52,7 +52,7 @@ class Spinner(threading.Thread):
         if Spinner.selfthread:
             Spinner.selfthread.join(2)
             Spinner.selfthread = None
-        Spinner().write('\n')
+        #Spinner().write('\n')
 
     def run(self):
         self.write(self.sequence[-1])
@@ -907,7 +907,7 @@ class SquashDistributive(Distributive):
         self.packToSquash(dFrom.directory, self.file)
 
 class IsoDistributive(Distributive):
-    reLive = re.compile(r"^live[^.]*(\.(\d+))?\.squashfs$",re.S)
+    reLive = re.compile(r"^live[^.]*\.squashfs(\.(\d+))?$",re.S)
 
     def __init__(self,file,parent=None,mdirectory="/mnt/cdrom",
             bdirectory="/var/calculate/tmp/iso"):
@@ -949,6 +949,7 @@ class IsoDistributive(Distributive):
         self._mountIso(self.file,mdirectory)
         fileLive = self._getLastLive(mdirectory)
         if not fileLive:
+            self._umountIso(mdirectory)
             raise DistributiveError(_("Iso %s doesn't contain live image") %
                     self.file)
         return SquashDistributive(pathjoin(mdirectory,fileLive),

pym/cl_install.py

@@ -586,7 +586,7 @@ class cl_install(color_print):
         self.clVars = None
         self.clTempl = None
         self.color = True
-        self.listDisksOptions = [] 
+        self.listDisksOptions = []
         self.listBindsOptions = []
         self.listSwapsOptions = []
         self.startMessage = False
@@ -1155,13 +1155,11 @@ class cl_install(color_print):
         if result:
             self.printLine((('blueBr','['),
                             ('greenBr',' ok '),
-                            ('blueBr',']')),[],printBR=False)
-            self.defaultPrint("")
+                            ('blueBr',']')),[])
         else:
             self.printLine((('blueBr','['),
                             ('redBr',' !! '),
-                            ('blueBr',']')),[],printBR=False)
-            self.defaultPrint("")
+                            ('blueBr',']')),[])
             if failMessage:
                 self.printERROR(failMessage)
         self.startMessage = False
@@ -1176,7 +1174,7 @@ class cl_install(color_print):
                                os.listdir(pathGlModules))
         mapGL_drivers = {'fglrx':"ati" if "ati" in openGlMods
                                  else defaultGL,
-                         'nvidia':"nvidia" if "nvidia" in openGlMods 
+                         'nvidia':"nvidia" if "nvidia" in openGlMods
                                   else defaultGL}
         x11_driver = self.clVars.Get('os_install_x11_video_drv')
         if x11_driver in mapGL_drivers:
@@ -1247,6 +1245,7 @@ class cl_install(color_print):
         sourceDistr = None
         targetDistr = None
         error = None
+        distrCopy = False
         try:
             rootPartdev = self.clVars.Get('os_install_root_dev')
             rootPartCmdList = filter(lambda x: x['dev']==rootPartdev,
@@ -1361,11 +1360,13 @@ the system") + " (yes/no)"
 
 
                 # install distributive
-                self.printSUCCESS(
-                    _("Unpacking system image into target")+" ... ",printBR=False)
+                distrCopy = True
+                self.printSUCCESS("%s ... "%
+                    _("Unpacking system image into target"),printBR=False)
                 self.clVars.Get('os_grub_conf')
                 targetDistr.installFrom(sourceDistr)
-
+                self.defaultPrint('\n')
+                distrCopy = False
                 self.printSUCCESS("Unpacking complete")
 
                 # join templates
@@ -1404,13 +1405,18 @@ the system") + " (yes/no)"
                 error += i
         except KeyboardInterrupt,e:
             if self.startMessage:
-                #self.defaultPrint("\b\b")
+                self.defaultPrint("\b\b")
                 self.printByResult(False)
-            self.defaultPrint("\n")
+            if distrCopy:
+                distrCopy = False
+                self.defaultPrint("\n")
             self.printWARNING("Interrupting the installation")
             error = _("Installation manually interrupt")
         if self.startMessage:
             self.printByResult(False)
+        if distrCopy:
+            distrCopy = False
+            self.defaultPrint("\n")
         try:
             if self.clTempl:
                 self.clTempl.closeFiles()

setup.py

@@ -102,7 +102,7 @@ setup(
     name = 'calculate-install',
     version = "2.2.0",
     description = "Calculate Linux installer",
-    author = "Mir Calculate Ltd.",
+    author = "Calculate Ltd.",
     author_email = "support@calculate.ru",
     url = "http://calculate-linux.org",
     license = "http://www.apache.org/licenses/LICENSE-2.0",