|
|
|
@ -585,7 +585,7 @@ class cl_assemble(color_print):
|
|
|
|
|
gitConfig = pathJoin(portagePath, '.git/config')
|
|
|
|
|
if path.exists(gitConfig):
|
|
|
|
|
removeDir(portagePath)
|
|
|
|
|
if self.clVars.Get('cl_assemble_branch') in ('master','develop'):
|
|
|
|
|
if self.clVars.Get('cl_assemble_branch') in ('master','update'):
|
|
|
|
|
pathOverlay = pathJoin(self.assemblePath,'var/lib/layman/calculate')
|
|
|
|
|
if path.exists(pathOverlay):
|
|
|
|
|
updateBranch= \
|
|
|
|
@ -616,7 +616,7 @@ class cl_assemble(color_print):
|
|
|
|
|
else:
|
|
|
|
|
self.runChroot("layman -L")
|
|
|
|
|
self.runChroot("layman -a calculate")
|
|
|
|
|
if self.clVars.Get('cl_assemble_branch') in ('master','develop'):
|
|
|
|
|
if self.clVars.Get('cl_assemble_branch') in ('master','update'):
|
|
|
|
|
updateBranch= "cd {portage};git checkout {branch}".format(
|
|
|
|
|
portage='/var/lib/layman/calculate',
|
|
|
|
|
branch=self.clVars.Get('cl_assemble_branch'))
|
|
|
|
|