diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo index d95ab0e..e5bc309 100644 Binary files a/i18n/cl_builder_ru.mo and b/i18n/cl_builder_ru.mo differ diff --git a/pym/cl_builder.py b/pym/cl_builder.py index e49a795..cee01e6 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -540,15 +540,32 @@ class cl_builder(color_print): distros = self.clVars.Get('cl_builder_distro') if len(distros) == 1: newprofile = distros[0] - if not newprofile in self.clVars.Get('cl_builder_distro'): - if newprofile: - self.printERROR(_("wrong value for '--profile'")) + newprofile = newprofile or "" + likeProfile = filter(lambda x:newprofile in x, + self.clVars.Get('cl_builder_distro')) + if len(likeProfile) != 1: + if newprofile != "list": + if not likeProfile: + if newprofile: + self.printERROR(_("wrong value for '--profile'")) + self.printERROR( + _("specify 'list' in '--profile' value for print " + "all available assembled distro")) + else: + self.printERROR(_("need specify '--profile'")) + return False + else: + self.printERROR( + _("specified value of '--profile' is ambiguous. " + "Please specify profile more exactly.")) + self.defaultPrint(_("Select profile from")+":\n") else: - self.printERROR(_("need specify '--profile'")) - self.defaultPrint(_("Available assembled distro")+":\n") - for profile in self.clVars.Get('cl_builder_distro'): + likeProfile = self.clVars.Get('cl_builder_distro') + self.defaultPrint(_("Available assembled distro")+":\n") + for profile in likeProfile: self.printSUCCESS(profile) return False + newprofile = likeProfile[0] self.clVars.Set('os_builder_profile', newprofile, True) self.assembleIso = True self.clVars.Set('cl_builder_path', _toUNICODE(envData.getVar(newprofile,