diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-12-04 23:10:50 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-12-17 23:36:22 +0100 |
| commit | 2cbebc021fdb994cfdcf1ec1f3ea7b44f6cbfa79 (patch) | |
| tree | 5f04f2659e7d9a5655b6c33390d0f4b5be69c407 /commands | |
| parent | a754cc71e11ebdeb3b867cfd9c075d01a1a98642 (diff) | |
| download | clufter-2cbebc021fdb994cfdcf1ec1f3ea7b44f6cbfa79.tar.gz clufter-2cbebc021fdb994cfdcf1ec1f3ea7b44f6cbfa79.tar.xz clufter-2cbebc021fdb994cfdcf1ec1f3ea7b44f6cbfa79.zip | |
commands/ccs2pcscmd*: apply cib-meld-templates filter
...with a chance it will not be required in the future.
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/ccs2pcscmd.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/commands/ccs2pcscmd.py b/commands/ccs2pcscmd.py index 3a2e8da..e31026a 100644 --- a/commands/ccs2pcscmd.py +++ b/commands/ccs2pcscmd.py @@ -21,9 +21,10 @@ from .ccs2pcs import ccsflat2cibfinal_chain ('stringiter-combine2', ('cmd-wrap')))))), (ccsflat2cibfinal_chain, - ('cib2pcscmd', - ('stringiter-combine2' # , ('cmd-wrap' ... - ))))) + ('cib-meld-templates', + ('cib2pcscmd', + ('stringiter-combine2' # , ('cmd-wrap' ... + )))))) def ccs2pcscmd_flatiron(cmd_ctxt, input=PATH_CLUSTERCONF, output="-", @@ -61,6 +62,7 @@ def ccs2pcscmd_flatiron(cmd_ctxt, cmd_ctxt['pcscmd_start_wait'] = start_wait cmd_ctxt['pcscmd_noguidance'] = noguidance cmd_ctxt['text_width'] = text_width + # XXX possibility to disable cib-meld-templates file_proto = protocols.plugins['file'].ensure_proto return ( @@ -84,7 +86,9 @@ def ccs2pcscmd_flatiron(cmd_ctxt, # ( # ( # ( - # file_proto(output), # already tracked + # ( + # file_proto(output), # already tracked + # ), # ), # ), # ), @@ -103,9 +107,10 @@ def ccs2pcscmd_flatiron(cmd_ctxt, ('stringiter-combine2', ('cmd-wrap'))))), (ccsflat2cibfinal_chain, - ('cib2pcscmd', - ('stringiter-combine2' # , ('cmd-wrap' ... - ))))) + ('cib-meld-templates', + ('cib2pcscmd', + ('stringiter-combine2' # , ('cmd-wrap' ... + )))))) def ccs2pcscmd_needle(cmd_ctxt, input=PATH_CLUSTERCONF, output="-", @@ -143,6 +148,7 @@ def ccs2pcscmd_needle(cmd_ctxt, cmd_ctxt['pcscmd_start_wait'] = start_wait cmd_ctxt['pcscmd_noguidance'] = noguidance cmd_ctxt['text_width'] = text_width + # XXX possibility to disable cib-meld-templates file_proto = protocols.plugins['file'].ensure_proto return ( @@ -164,7 +170,9 @@ def ccs2pcscmd_needle(cmd_ctxt, # ( # ( # ( - # file_proto(output), # already tracked + # ( + # file_proto(output), # already tracked + # ), # ), # ), # ), |