Change emerge --metadata to emerge --sync.

pym/cl_builder.py

@@ -261,30 +261,21 @@ class cl_builder(color_print):
 
         if self.assembleIso and \
             self.clVars.Get('os_builder_profile').endswith('binary'):
-            self.printMessageForTest(_("Updating calculate overlay"))
-            updateLayman = self.runChroot(distrPath,"layman -s calculate")
-            self.printByResult(updateLayman.success())
-
-        self.printByResult(True)
-
-        builderPath = self.clVars.Get('cl_builder_path')
-        updateMeta = False
-        for gitName,gitDir in (('portage','/usr/portage'),
-                       ('overlay','/var/lib/layman/calculate')):
-            gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
-            if "heads/develop" in readFile(gitHead):
-                self.printMessageForTest(
-                    _("Changing {repname} repository branch to '{branch}'").
-                        format(repname=gitName,
-                               branch='master'))
-                changeBranch = self.runChroot(distrPath,
-                    "cd %s;git fetch;git checkout master;git pull"%gitDir)
-                self.printByResult(changeBranch.success())
-                updateMeta = True
-
-        if updateMeta:
-            self.printMessageForTest(_("Updating portage metadata"))
-            updateMeta = self.runChroot(distrPath,"emerge --metadata")
+            builderPath = self.clVars.Get('cl_builder_path')
+            for gitName,gitDir in (('portage','/usr/portage'),
+                           ('overlay','/var/lib/layman/calculate')):
+                gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
+                if "heads/develop" in readFile(gitHead):
+                    self.printMessageForTest(
+                        _("Changing {repname} repository branch to '{branch}'").
+                            format(repname=gitName,
+                                   branch='master'))
+                    changeBranch = self.runChroot(distrPath,
+                        "cd %s;git fetch;git checkout master"%gitDir)
+                    self.printByResult(changeBranch.success())
+
+            self.printMessageForTest(_("Updating portage"))
+            updateMeta = self.runChroot(distrPath,"emerge --sync")
             self.printByResult(updateMeta.success())
 
         self.applyTemplatesForSquash(distrPath)