Fix for new utilities

pym/cl_assemble.py

@@ -621,9 +621,9 @@ class cl_assemble(color_print):
             self.printMessageForTest(_("Installing %s")%'dev-vcs/git')
             self.runChroot("USE='-perl -curl -webdav' emerge -1 git")
 
-        emergeSync = "emerge --sync"
+        emergeSync = "eix-sync"
         self.printMessageForTest(_("Updating portages"))
-        self.runChroot(emergeSync)
+        self.runChroot(emergeSync,showProcess=True)
 
         emergeLayman = "USE='git' emerge layman"
         self.printMessageForTest(_("Installing %s")%"layman")
@@ -761,8 +761,11 @@ class cl_assemble(color_print):
                                'sys-apps/calculate-core')
                 if path.exists(path.join(self.clVars.Get('cl_assemble_path'),
                              "usr/sbin/cl-core")):
-                    self.runChroot("/usr/sbin/cl-core --append-variable "
-                               "cl_merges=calculate-install")
+                    try:
+                        self.runChroot("/usr/sbin/cl-core --append-variable "
+                                   "cl_merges=calculate-install")
+                    except:
+                        pass
                 else:
                     self.runChroot("cl-install --install")
             else:
@@ -774,7 +777,7 @@ class cl_assemble(color_print):
 
             if not isinstance(self.sourceDistr,IsoDistributive):
                 self.printMessageForTest(_("Receiving kernel sources"))
-                self.runChroot('USE="-vmlinuz" emerge '
+                self.runChroot('USE="-minimal -vmlinuz" emerge '
                                "sys-kernel/calculate-sources")
 
             if not isinstance(self.sourceDistr,IsoDistributive):
@@ -1662,7 +1665,7 @@ class cl_assemble(color_print):
         while drivers:
             repeatDrivers = []
             for verName,maskName,drvVer in drivers:
-                rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
+                rePackage = re.compile("^\[ebuild[^\]]+]\s+([^\s:]+)")
                 checkprocess = self.runChroot(
                             "emerge -pv %s"%
                             drvVer, raiseError=False,joinErr=True)

pym/cl_assemble_cmd.py

@@ -141,8 +141,9 @@ class assemble_cmd(share_cmd):
                                self.logicObj.getValidSource())+["stage"]
             self.checkChoice("--source",values.source, validSources)
         if values.name:
+            print values.name.__repr__()
             if not self.logicObj.setName(values.name):
-                self.error(_("option %s")%"--name"+
+                self.optobj.error(_("option %s")%"--name"+
                     ": "+ _("invalid value '%s'"%values.name))
         return (values, args)