From 6609369a7e6550bab48020ba0c46aec0a68b34d2 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 11 Jan 2013 13:19:53 +0400 Subject: [PATCH] Fix comments --- pym/cl_datavars.py | 16 ++++++++-------- pym/cl_distr.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pym/cl_datavars.py b/pym/cl_datavars.py index 0fff631..d5af8ed 100644 --- a/pym/cl_datavars.py +++ b/pym/cl_datavars.py @@ -503,25 +503,25 @@ class DataVars(object): return valueVar.encode("UTF-8") def GetRemoteInfo(self, envFile): - """Получение информационных переменных - - из файла envFile""" + """ + Get information variables from server env + """ optionsInfo = {} - # получить объект настроенный на ini + # get ini object config = iniParser(envFile) - # получаем все секции из конфигурационного файла + # get all section from ini object allsect = config.getAllSectionNames() if allsect: - # Секция (название сервиса) + # sectin - service name for section in allsect: allvars = config.getAreaVars(section) if allvars == False: return False - # Опции сервиса + # get service option options = {} for varName, value in allvars.items(): varName = varName.encode("UTF-8") - value=convertStrListDict(value.encode("UTF-8")) + value=value.encode("UTF-8") options[varName] = value if options: optionsInfo[section] = options diff --git a/pym/cl_distr.py b/pym/cl_distr.py index 572e9dd..2d8e51e 100644 --- a/pym/cl_distr.py +++ b/pym/cl_distr.py @@ -1183,10 +1183,10 @@ class SquashDistributive(Distributive): raise DistributiveError(_("Failed to create squash") + " : %s"%_("command '%s' not found")%mksquashfsUtil) cmd = [mksquashfsUtil, "%s/"%directory,file, "-no-progress"] - if self.exclude: - cmd += ["-e"] + self.exclude if self.compress: cmd += ["-comp",self.compress] + if self.exclude: + cmd += ["-e"] + self.exclude processMkSquash = process(*cmd) if processMkSquash.failed(): raise DistributiveError(_("Failed to create squashfs") +