From f7eba4d4c2726314d880d27ff1ef5b52ec6e597c Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 26 Aug 2014 09:22:24 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD=D0=BE?= =?UTF-8?q?=D0=B5=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20applyTemplate=20=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20merge?= =?UTF-8?q?=3D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calculate/lib/cl_template.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/calculate/lib/cl_template.py b/calculate/lib/cl_template.py index fe055a8..ab79671 100644 --- a/calculate/lib/cl_template.py +++ b/calculate/lib/cl_template.py @@ -4516,6 +4516,9 @@ gettext -d cl_template "$*" if self.objVar.Get('cl_verbose_set') == 'on' and \ self.filesApply: self.verboseOutput(self.filesApply) + self.objVar.Set('cl_merge_pkg_pass',[],force=True) + self.objVar.Set('cl_merge_pkg_new',[],force=True) + self.objVar.Set('cl_merge_pkg',[],force=True) return (self.createdDirs, self.filesApply) def verboseOutput(self,filesApply):