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