From 7556d10bc08f205d115c8180157d87116421cb12 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 1 Sep 2015 10:32:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=B8=D0=B4=D0=B5=D0=BD=D1=82=D0=B8=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20livecd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/variables/builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/builder/variables/builder.py b/pym/builder/variables/builder.py index efb7b0c..6d5b47b 100644 --- a/pym/builder/variables/builder.py +++ b/pym/builder/variables/builder.py @@ -473,6 +473,8 @@ class VariableClBuilderNewId(BaseBuildId): def check(self, value): if not value and self.Get('cl_builder_source_filename'): raise VariableError(_("Please specify the id")) + if not re.match("^[A-Za-z][A-Za-z0-9/:_-]+$", value): + raise VariableError(_("Wrong symbols in build ID")) if value in self.Get('cl_builder_storage'): raise VariableError(_("Assemble %s already exists")%value) @@ -680,7 +682,7 @@ class VariableClBuilderImageFilename(Variable): arch) def get(self): - if self.Get('os_root_type') == 'livecd': + if self.Get('os_root_type') != 'livecd': base_dn = self.Get('cl_builder_base_path') build_id = self.Get('cl_builder_id') build_id_path = self.Get('cl_builder_id_path')