|
|
|
@ -2313,6 +2313,9 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
# стек глобальных переменных
|
|
|
|
|
stackGlobalVars = []
|
|
|
|
|
|
|
|
|
|
# директория установленных программ
|
|
|
|
|
basePkgDir = "/var/db/pkg"
|
|
|
|
|
|
|
|
|
|
def __init__(self, objVar, servDir=False, dirsFilter=[], filesFilter=[]):
|
|
|
|
|
# Необрабатываемые директории
|
|
|
|
|
self.dirsFilter = dirsFilter
|
|
|
|
@ -2677,20 +2680,19 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
|
|
|
|
|
def getInstallPkgGentoo():
|
|
|
|
|
"""Выдает два списка, инсталлированные программы и номера версий"""
|
|
|
|
|
baseDir = "/var/db/pkg"
|
|
|
|
|
pkgs = []
|
|
|
|
|
reVer = re.compile("(?<=\-)\d+\.?\d*\.?\d*")
|
|
|
|
|
def getFilesDir(pkgs, dirname, names):
|
|
|
|
|
for nameFile in names:
|
|
|
|
|
absNameFile = os.path.join(dirname,nameFile)
|
|
|
|
|
if os.path.isdir(absNameFile):
|
|
|
|
|
tail = absNameFile.split(baseDir)
|
|
|
|
|
tail = absNameFile.split(self.basePkgDir)
|
|
|
|
|
if len(tail)==2:
|
|
|
|
|
tail = tail[1].split('/')
|
|
|
|
|
if len(tail)==3 and tail[1]!='virtual':
|
|
|
|
|
pkgs.append(tail[2])
|
|
|
|
|
return True
|
|
|
|
|
os.path.walk(baseDir,getFilesDir, pkgs)
|
|
|
|
|
os.path.walk(self.basePkgDir,getFilesDir, pkgs)
|
|
|
|
|
pkgs.sort()
|
|
|
|
|
names = []
|
|
|
|
|
versions = []
|
|
|
|
@ -2724,8 +2726,6 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
terms = funTxt[4:-1].replace(" ","")
|
|
|
|
|
# Название программы
|
|
|
|
|
nameProg = terms
|
|
|
|
|
#if "/" in terms:
|
|
|
|
|
#category, nameProg =
|
|
|
|
|
if not self.installProg:
|
|
|
|
|
self.installProg,self.installProgVersions=getInstallPkgGentoo()
|
|
|
|
|
replace = pkg(nameProg,self.installProg,self.installProgVersions)
|
|
|
|
@ -6184,6 +6184,15 @@ class plasma(samba):
|
|
|
|
|
"br":
|
|
|
|
|
xmlArea.insertBefore(childNodes[it],
|
|
|
|
|
firstChildArea)
|
|
|
|
|
# Добавление перевода строк в если его нет между полями
|
|
|
|
|
if self.docObj.getTypeField(node) == "var" and\
|
|
|
|
|
node.previousSibling and\
|
|
|
|
|
not (self.docObj.getTypeField(node.previousSibling) in\
|
|
|
|
|
("br","comment")):
|
|
|
|
|
xmlArea.insertBefore(self.docObj.createField("br",
|
|
|
|
|
[],"",[],
|
|
|
|
|
False,False),
|
|
|
|
|
node)
|
|
|
|
|
|
|
|
|
|
# Добавляем BR если его нет первым полем
|
|
|
|
|
xmlFields = xpath.Evaluate("child::field", xmlArea)
|
|
|
|
|