Исправлено формирование пути по идентификатору сборки

Mike Khiretskiy 9 years ago
parent f38366813e
commit dfff57b960

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

Loading…
Cancel
Save