Fix merge= action

calculate/lib/cl_template.py

@@ -4289,6 +4289,7 @@ gettext -d cl_template "$*"
             self.recalculateBaseDir()
             self.objVar.Set('cl_merge_pkg_pass',list(
                 set(self.objVar.Get('cl_merge_pkg_pass'))|
+                set(self.objVar.Get('cl_merge_pkg'))|
                 set(self.objVar.Get('cl_merge_pkg_new'))),force=True)
             self.objVar.Set('cl_merge_pkg',
                             self.objVar.Get('cl_merge_pkg_new'),force=True)
@@ -4547,7 +4548,8 @@ gettext -d cl_template "$*"
                               wrongPkg + ": " + nameFileTemplate)
             for pkg in mergePkgs:
                 if not pkg in self.objVar.Get('cl_merge_pkg_new') and \
-                   not pkg in self.objVar.Get('cl_merge_pkg_pass'):
+                   not pkg in self.objVar.Get('cl_merge_pkg_pass') and \
+                   not pkg in self.objVar.Get('cl_merge_pkg'):
                     self.objVar.Get('cl_merge_pkg_new').append(pkg)
 
         # Пропускаем директорию
@@ -4834,7 +4836,8 @@ gettext -d cl_template "$*"
                               wrongPkg + ": " + nameFileTemplate)
             for pkg in mergePkgs:
                 if not pkg in self.objVar.Get('cl_merge_pkg_new') and \
-                   not pkg in self.objVar.Get('cl_merge_pkg_pass'):
+                   not pkg in self.objVar.Get('cl_merge_pkg_pass') and \
+                   not pkg in self.objVar.Get('cl_merge_pkg'):
                     self.objVar.Get('cl_merge_pkg_new').append(pkg)
 
         # Родительская директория