|
|
|
@ -25,7 +25,8 @@ import traceback
|
|
|
|
|
from os import path
|
|
|
|
|
from cl_utils import process,pathJoin,getRunCommands,getTupleVersion,\
|
|
|
|
|
childMounts,_toUNICODE,isMount,typeFile, \
|
|
|
|
|
removeDir, pathJoin,listDirectory, getSquashList
|
|
|
|
|
removeDir, pathJoin,listDirectory, getSquashList, \
|
|
|
|
|
readFile
|
|
|
|
|
from subprocess import STDOUT,PIPE
|
|
|
|
|
from cl_print import color_print
|
|
|
|
|
from cl_datavars import DataVars
|
|
|
|
@ -262,6 +263,14 @@ class cl_builder(color_print):
|
|
|
|
|
updateLayman = self.runChroot(distrPath,"layman -s calculate")
|
|
|
|
|
self.printByResult(updateLayman.success())
|
|
|
|
|
|
|
|
|
|
gitHead = pathJoin(builderPath,"usr/portage/.git/HEAD")
|
|
|
|
|
if "heads/develop" in readFile(gitHead):
|
|
|
|
|
self.printMessageForTest(_("Changing repository branch to '%s'")%
|
|
|
|
|
'master')
|
|
|
|
|
changeBranch = self.runChroot(distrPath,
|
|
|
|
|
"cd /usr/portage;git fetch;git checkout master")
|
|
|
|
|
self.printByResult(changeBranch.success())
|
|
|
|
|
|
|
|
|
|
self.applyTemplatesForSquash(distrPath)
|
|
|
|
|
# change make.profile
|
|
|
|
|
builderPath = self.clVars.Get('cl_builder_path')
|
|
|
|
|