Add ability use different shortnames.

pym/cl_assemble.py

@@ -237,6 +237,10 @@ class cl_assemble(color_print):
                 self.printERROR(_("For performance of operation it is "
                                   "necessary to configure system")+".")
                 self.printERROR(_('Execute with parameter')+' "--configure".')
+                self.defaultPrint("\n"+_("Prepared for assembling system")+
+                                  ":\n")
+                for system in self.clVars.Get('cl_assemble_distro'):
+                    self.printSUCCESS(self.__profileShortname(system))
             self.removeDistroInfo()
             return False
         return True
@@ -377,7 +381,7 @@ class cl_assemble(color_print):
     def _updateMan(self):
         """Remove man, install man-db"""
         self.printMessageForTest(
-            _("Installing man-db"))
+        _("Installing man-db"))
         if "calculate" in self.clVars.Get('os_assemble_system_profile'):
             removeMan = "CLEAN_DELAY=0 emerge -C --backtrack=0 " \
                                "sys-apps/man"
@@ -504,7 +508,7 @@ class cl_assemble(color_print):
         """Check exists user and create new"""
         if self.runChroot("id %s"%username,raiseError=False).failed():
             self.printMessageForTest(
-                _("Creating %(user)s(%(id)d) user")%
+                _("Creating %(user)s (%(id)d) user")%
                     {'user':username,'id':userid})
             command = "useradd -u %d %s"%(userid,username)
             if groups:
@@ -528,7 +532,7 @@ class cl_assemble(color_print):
         if self.runChroot("groupmems -l -g %s"
                           %groupname,raiseError=False).failed():
             self.printMessageForTest(
-                _("Creating %(name)s(%(id)d) group")%
+                _("Creating %(name)s (%(id)d) group")%
                  {'name':groupname,'id':groupid})
             self.runChroot("groupadd -g %d %s"%(groupid,groupname))
             self.printByResult(True)
@@ -1009,3 +1013,9 @@ class cl_assemble(color_print):
                                        newprofile)
             self.clVars.Set('os_assemble_system_profile',newprofile,True)
             return True
+
+    def getValidSource(self):
+        """Get valid sources"""
+        distRep = DistributiveRepository(
+                    self.clVars.Get('cl_assemble_image_path'))
+        return distRep._getAvailableShortnames()

pym/cl_assemble_cmd.py

@@ -54,11 +54,9 @@ CMD_OPTIONS = [{'shortOption':"d",
                },
                {'longOption':"source",
                 'optVal':"SOURCE",
-                'type':'choice',
                 'default':'stage',
-                'choices_regignore':["stage"]+OSSYSTEM_LIST,
                 'help':_("base stage for assembling") + " " +
-                       _("(stage or %s)")%",".join(OSSYSTEM_LIST)
+                       _("(stage or shortname)")
                },
                {'longOption':"ver",
                 'optVal':"VER",
@@ -126,15 +124,24 @@ class assemble_cmd(share_cmd):
         self.logicObj = cl_assemble()
         self.optionsConfigureIncompatible=["U","b","skipfirst","m","break"]
         self.optionsBreakIncompatible=["U","b","skipfirst","m","c","ver",
-                                       "no_unmount","sync"]
+                                       "no_unmount","sync","source"]
         self.optionsDependenceIncompatible=["U","b","skipfirst","m","break","c",
-                                            "no_unmount","sync"]
+                                            "no_unmount","sync","source"]
         self.optionsMakeIncompatible=["U","c","u","break","no_unmount",
-                                      "sync"]
+                                      "sync","source"]
         self.optionsUpdateIncompatible=["U","c","break","m","no_unmount",
-                                        "sync"]
+                                        "sync","source"]
         self.optionsUpdatenosyncIncompatible=["u","c","break","m","no_unmount",
-                                        "sync"]
+                                        "sync","source"]
+
+    def checkChoice(self,option,value,values):
+        """Check choice and raise error"""
+        if not value.upper() in map(lambda x:x.upper(),values):
+            self.optobj.error(_("option %s")%option+
+                    ": "+
+                    _("invalid choice")+": '%s'"%value +
+                    " (%s)"%_("choose from %s")%
+                    ", ".join(values))
 
     def checkOpts(self, values, args):
         """Check values all specified options."""
@@ -181,6 +188,11 @@ class assemble_cmd(share_cmd):
         if values.ver:
             self.logicObj.clVars.Set('os_assemble_linux_ver',
                                      values.ver,True)
+        self.setAction()
+        if values.source:
+            validSources = map(lambda x:x.upper(),
+                               self.logicObj.getValidSource())+["stage"]
+            self.checkChoice("--source",values.source, validSources)
         self.optobj.checkVarSyntax(values)
         return (values, args)
 

scripts/cl-assemble

@@ -44,7 +44,6 @@ if __name__ == "__main__":
         sys.exit(1)
     if not assemble.setVars(options):
         sys.exit(1)
-    assemble.setAction()
     # print variables
     if options.v or options.filter or options.xml:
         assemble.printVars(options)