|
|
|
@ -608,7 +608,7 @@ class VariableClBuilderIdPath(ReadonlyVariable):
|
|
|
|
|
def get(self):
|
|
|
|
|
build_id = self.Get('cl_builder_id')
|
|
|
|
|
if build_id:
|
|
|
|
|
return re.sub("[/:+]", "_", self.Get('cl_builder_id'))
|
|
|
|
|
return re.sub("[/:]", "_", self.Get('cl_builder_id'))
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
class VariableClBuilderId(ReadonlyVariable):
|
|
|
|
@ -1086,7 +1086,7 @@ class VariableClBuilderBranchName(Variable):
|
|
|
|
|
def get(self):
|
|
|
|
|
dv = self.Get('cl_builder_linux_datavars')
|
|
|
|
|
if dv:
|
|
|
|
|
if "getbinpkg" in self.Get('cl_features'):
|
|
|
|
|
if "getbinpkg" in dv.Get('cl_features'):
|
|
|
|
|
return [Git.Reference.Tag for x in dv.Get('cl_update_rep_name')]
|
|
|
|
|
else:
|
|
|
|
|
branch = dv.Get('cl_update_branch')
|
|
|
|
|