Using of the '!' in action parameter is available now. fixed #36

master
Иванов Денис 3 years ago
parent 68cc128d96
commit 7978f4fcd7

@ -2763,7 +2763,15 @@ class DirectoryProcessor:
("Action parameter is not set for template:"
" {0}").format(template_path))
return False
elif parameters.action not in self.action:
elif parameters.action.startswith('!'):
action_matching = (parameters.action[1:].strip() not in
self.action)
elif parameters.action not in self.action:
action_matching = False
else:
action_matching = True
if not action_matching:
self.output.set_warning(
("Action parameter value '{0}' does not match its"
" current value{1} '{2}'. Template: {3}").format(

@ -1470,6 +1470,17 @@ class TestDirectoryProcessor:
directory_processor.process_template_directories()
assert os.path.exists(join_paths(CHROOT_PATH,'/etc/dir_63/file_0'))
def test_using_excepting_action_values(self):
datavars.main['cl_template_path'] = os.path.join(CHROOT_PATH,
'templates_47')
directory_processor = DirectoryProcessor(
'update',
datavars_module=datavars,
package='test-category/test-package'
)
directory_processor.process_template_directories()
assert os.path.exists(join_paths(CHROOT_PATH,'/etc/dir_65/file_0'))
def test_view_tree(self):
list_path = join_paths(CHROOT_PATH, '/etc')
show_tree(list_path)

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

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

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

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