Fix wrong message and conditions.

pym/cl_assemble.py

@@ -145,10 +145,12 @@ class cl_assemble(color_print):
                         ('blueBr',']'),
                        ), offsetL, printBR)
 
-    def printByResult(self,result,failMessage=None):
+    def printByResult(self,result,failMessage=None,skip=False):
         if self.startMessage:
             offset = 3
-            if result:
+            if skip:
+                self.printSkip(" ", self.lenStartMessage + offset)
+            elif result:
                 self.printOnlyOK(" ", self.lenStartMessage + offset)
             else:
                 self.printOnlyNotOK(" ", self.lenStartMessage + offset)
@@ -162,6 +164,8 @@ class cl_assemble(color_print):
             self.clVars.Set("cl_action","break",True)
         elif action == "make":
             self.clVars.Set("cl_action","make",True)
+        elif action == "update":
+            self.clVars.Set("cl_action","update",True)
         elif action == "dependence":
             self.clVars.Set("cl_action","dependence",True)
         else:
@@ -705,7 +709,6 @@ class cl_assemble(color_print):
             forcesystem:
             self.printERROR(_("WARNING") +": " +
                 _("will be recompiled system packages"))
-            return False
         if "finish" in self.clVars.Get('cl_assemble_step_world'):
             if forcesystem:
                 return True
@@ -726,10 +729,12 @@ class cl_assemble(color_print):
         baseType = self.clVars.Get('cl_assemble_image_type')
         getMake = lambda : self.clVars.Get('cl_assemble_make')
         getStepCount = self._getStepCount
-        if self.clVars.Get('os_assemble_system_profile'):
-            self.applyConfigureTemplates(self.assemblePath,
-                                    _("Configurate by %s templates")%
-                                    "assemble/setup")
+        if not forcesystem:
+            self.applyConfigureTemplates(
+                        self.clVars.Get('cl_assemble_path'),
+                            _("Configurate by %s templates")%
+                            "assemble/setup")
+            self.printByResult(True)
         while not makeComplete:
             if (baseType != "iso" or forcesystem) and \
                 getMake() in ("newuse","") and getStepCount('system') < 2:
@@ -751,13 +756,12 @@ class cl_assemble(color_print):
 
     def _printCheckExecute(self,command,action,step="world",checkBuild=False):
         if not action in self.clVars.Get('cl_assemble_step_%s'%step):
+            msg = _("Executing '%s'")%command
             if checkBuild and not self.__isAnyPackageBuilded():
-                self.printWARNING(_("Executing '%s'")% command + " ...")
-                offset = 3
-                if result:
-                    self.printSkip(" ", self.lenStartMessage + offset)
+                self.printMessageForTest(msg)
+                self.printByResult(True,skip=True)
             else:
-                self.printSUCCESS(_("Executing '%s'")% command + " ...")
+                self.printSUCCESS(msg + " ...")
                 self.runChroot(command, showProcess=True)
             self._appendToStep(step,action)
 

pym/cl_assemble_cmd.py

@@ -144,7 +144,7 @@ class assemble_cmd(share_cmd):
         if values.march:
             self.logicObj.clVars.Set('os_assemble_arch_machine',
                                      values.march,True)
-        if not values.v:
+        if not values.v and self.isRoot(printError=False):
             if values.m:
                 self.checkIncompatibleParam("make")
             if getattr(values,"break"):
@@ -163,8 +163,8 @@ class assemble_cmd(share_cmd):
                     _("need specify action: configure (-c), make (-m),"
                       " break (--break), update (-u|-U) or check dependence (-D)"))
             rootDev = self.logicObj.clVars.Get('os_assemble_root_dev')
-            if self.logicObj._checkAlreadyAssembling(printERROR=False) and \
-                (values.c and not values.d) and ( not rootDev or \
+            if not self.logicObj._checkAlreadyAssembling(printERROR=False) \
+                and (values.c and not values.d) and ( not rootDev or \
                 rootDev in self.logicObj.clVars.Get('cl_assemble_dev')):
                 self.optobj.error(_("need specify disk by '-d' option"))
         if values.d:
@@ -182,19 +182,25 @@ class assemble_cmd(share_cmd):
         self.optobj.checkVarSyntax(values)
         return (values, args)
 
+    def isScratch(self):
+        if self.logicObj.clVars.Get('os_scratch') == "on":
+            self.printERROR(_("You can not use cl-assemble in Scratch mode."))
+            return True
+        return False
+
     def setAction(self):
         """Set action by configuration or install system"""
         if self.optobj.values.b:
             self.logicObj.clVars.Set('cl_assemble_buildpkg',
                                      "yes",True)
-        if getattr(self.optobj.values,"break"):
+        elif getattr(self.optobj.values,"break"):
             self.logicObj.setAction("break")
         elif self.optobj.values.m:
             self.logicObj.setAction("make")
             if self.optobj.values.skipfirst:
                 self.logicObj.clVars.Set('cl_assemble_skipfirst',
                                          "yes",True)
-        elif self.optobj.values.u:
+        elif self.optobj.values.u or self.optobj.values.U:
             self.logicObj.setAction("update")
             if self.optobj.values.skipfirst:
                 self.logicObj.clVars.Set('cl_assemble_skipfirst',

scripts/cl-assemble

@@ -39,6 +39,9 @@ if __name__ == "__main__":
     # set color/nocolor for display messages
     assemble.setPrintNoColor(options)
     # set values to variables
+    # check root 
+    if not options.v and not assemble.isRoot():
+        sys.exit(1)
     if not assemble.setVars(options):
         sys.exit(1)
     assemble.setAction()
@@ -46,8 +49,7 @@ if __name__ == "__main__":
     if options.v or options.filter or options.xml:
         assemble.printVars(options)
         sys.exit(0)
-    # check root 
-    if not assemble.isRoot():
+    if assemble.isScratch():
         sys.exit(1)
     if options.D:
         if not assemble.checkDependence():