|
|
|
|
@ -522,7 +522,7 @@ class fileHeader(_terms):
|
|
|
|
|
"""
|
|
|
|
|
# Допустимые параметры заголовка
|
|
|
|
|
allowParam = ["format","dotall","multiline",
|
|
|
|
|
"comment", "append", "force","dconfpath",
|
|
|
|
|
"comment", "append", "force","dconf",
|
|
|
|
|
"link", "mirror", "symbolic", "chmod", "chown", "name",
|
|
|
|
|
"path", "autoupdate","protected", "run","exec","merge",
|
|
|
|
|
"module","env","postmerge"]
|
|
|
|
|
@ -5935,7 +5935,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
%wrongOpt[0])
|
|
|
|
|
return False
|
|
|
|
|
if objHeadNew.fileType != 'dconf':
|
|
|
|
|
wrongOpt = [x for x in ("dconfpath",)
|
|
|
|
|
wrongOpt = [x for x in ("dconf",)
|
|
|
|
|
if objHeadNew.params.has_key(x)]
|
|
|
|
|
if wrongOpt:
|
|
|
|
|
self.setError(\
|
|
|
|
|
@ -5959,8 +5959,8 @@ gettext -d cl_template "$*"
|
|
|
|
|
if objHeadNew.params.has_key("dotall"):
|
|
|
|
|
objTempl.setDotall()
|
|
|
|
|
if formatTemplate == 'dconf':
|
|
|
|
|
if "dconfpath" in objHeadNew.params:
|
|
|
|
|
objTempl.setPath(objHeadNew.params['dconfpath'])
|
|
|
|
|
if "dconf" in objHeadNew.params:
|
|
|
|
|
objTempl.setPath(objHeadNew.params['dconf'])
|
|
|
|
|
objTempl.setUser(self.objVar.Get('ur_login'))
|
|
|
|
|
if not objTempl:
|
|
|
|
|
self.setError(\
|
|
|
|
|
|
