|
|
|
@ -588,7 +588,8 @@ class cl_assemble(color_print):
|
|
|
|
|
if self.clVars.Get('cl_assemble_branch') in ('master','develop'):
|
|
|
|
|
pathOverlay = pathJoin(self.assemblePath,'var/lib/layman/calculate')
|
|
|
|
|
if path.exists(pathOverlay):
|
|
|
|
|
updateBranch= "cd {portage};git checkout {branch}".format(
|
|
|
|
|
updateBranch= \
|
|
|
|
|
"cd {portage};git pull;git checkout {branch}".format(
|
|
|
|
|
portage='/var/lib/layman/calculate',
|
|
|
|
|
branch=self.clVars.Get('cl_assemble_branch'))
|
|
|
|
|
self.runChroot(updateBranch)
|
|
|
|
@ -1195,7 +1196,7 @@ class cl_assemble(color_print):
|
|
|
|
|
command = command % tuple(map(lambda x:self.clVars.Get(x),
|
|
|
|
|
action["args"]))
|
|
|
|
|
suffix = ""
|
|
|
|
|
if "condition" in action and not "checkcommand" in action:
|
|
|
|
|
if "condition" in action:
|
|
|
|
|
suffix += "*"
|
|
|
|
|
showLegend = True
|
|
|
|
|
if dontRepeatCompleted and action["step"] in stepWorld:
|
|
|
|
|