|
|
|
@ -511,7 +511,7 @@ class VariableClBuilderNewId(BaseBuildId):
|
|
|
|
|
def check(self, value):
|
|
|
|
|
if not value and self.Get('cl_builder_source_filename'):
|
|
|
|
|
raise VariableError(_("Please specify the build ID"))
|
|
|
|
|
if value and not re.match("^[A-Za-z][A-Za-z0-9/:_-]+$", value):
|
|
|
|
|
if value and not re.match("^[A-Za-z][A-Za-z0-9/:_+-]+$", value):
|
|
|
|
|
raise VariableError(_("Wrong symbols in the build ID"))
|
|
|
|
|
if value in self.Get('cl_builder_storage'):
|
|
|
|
|
raise VariableError(_("Build %s already exists")%value)
|
|
|
|
@ -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):
|
|
|
|
|