|
|
@ -265,7 +265,8 @@ class cl_builder(color_print):
|
|
|
|
for gitName,gitDir in (('portage','/usr/portage'),
|
|
|
|
for gitName,gitDir in (('portage','/usr/portage'),
|
|
|
|
('overlay','/var/lib/layman/calculate')):
|
|
|
|
('overlay','/var/lib/layman/calculate')):
|
|
|
|
gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
|
|
|
|
gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
|
|
|
|
if "heads/develop" in readFile(gitHead):
|
|
|
|
if "heads/develop" in readFile(gitHead) or \
|
|
|
|
|
|
|
|
"heads/update" in readFile(gitHead):
|
|
|
|
self.printMessageForTest(
|
|
|
|
self.printMessageForTest(
|
|
|
|
_("Changing {repname} repository branch to '{branch}'").
|
|
|
|
_("Changing {repname} repository branch to '{branch}'").
|
|
|
|
format(repname=gitName,
|
|
|
|
format(repname=gitName,
|
|
|
|