Added ignoring files from the base templates directory. fixed #32

calculate/templates/template_processor.py

@@ -2135,6 +2135,8 @@ class DirectoryProcessor:
             entries = os.scandir(self.base_directory)
 
             for node in entries:
+                if node.is_file():
+                    continue
                 self.directory_tree = {}
                 parameters = ParametersContainer()
                 if self._namespace:

tests/templates/test_directory_processor.py

@@ -1459,6 +1459,17 @@ class TestDirectoryProcessor:
             output_text = output_file.read()
             assert output_text == expected_output
 
+    def test_ignoring_files_in_templates_base_directory(self):
+        datavars.main['cl_template_path'] = os.path.join(CHROOT_PATH,
+                                                         'templates_46')
+        directory_processor = DirectoryProcessor(
+                                         'install',
+                                         datavars_module=datavars,
+                                         package='test-category/test-package'
+                                                )
+        directory_processor.process_template_directories()
+        assert os.path.exists(join_paths(CHROOT_PATH,'/etc/dir_63/file_0'))
+
     def test_view_tree(self):
         list_path = join_paths(CHROOT_PATH, '/etc')
         show_tree(list_path)

tests/templates/testfiles/test_dir_processor_root/templates_46/file_to_ignore

@@ -0,0 +1 @@
+Suzumiya Haruhi no Yuutsu

tests/templates/testfiles/test_dir_processor_root/templates_46/install/.calculate_directory

@@ -0,0 +1 @@
+{% calculate action = "install", append = "skip", package = "test-category/test-package" %}

tests/templates/testfiles/test_dir_processor_root/templates_46/install/dir_63/file_0

@@ -0,0 +1,2 @@
+{% calculate append = 'join', format = 'raw' %}
+Something I can never have