|
|
|
@ -3830,10 +3830,11 @@ class Template(_file, _terms, _warning, xmlShare, _shareTemplate):
|
|
|
|
|
self.critical = critical
|
|
|
|
|
self.postmergePkgs = []
|
|
|
|
|
self._locked_packages = {}
|
|
|
|
|
if objVar and objVar.Get("cl_merge_pkg"):
|
|
|
|
|
if objVar and objVar.Get("cl_merge_pkg"):
|
|
|
|
|
self._locked_packages = {
|
|
|
|
|
x.partition(":")[0]: None
|
|
|
|
|
for x in objVar.Get('cl_merge_pkg')
|
|
|
|
|
if x
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self.postmergeFile = "/var/lib/calculate/-postmerge"
|
|
|
|
@ -4970,7 +4971,8 @@ gettext -d cl_template "$*"
|
|
|
|
|
self.objVar.Get('cl_merge_pkg_pass') +
|
|
|
|
|
self.objVar.Get('cl_merge_pkg'))
|
|
|
|
|
if ":" not in pkg:
|
|
|
|
|
curlistset = {x.partition(":")[0] for x in curlistset}
|
|
|
|
|
curlistset = {x.partition(":")[0] for x in curlistset
|
|
|
|
|
if x}
|
|
|
|
|
if pkg not in curlistset:
|
|
|
|
|
self.objVar.Get('cl_merge_pkg_new').append(pkg)
|
|
|
|
|
|
|
|
|
|