From d1264d0dec02ed49f09a9eb29996831edabbbf34 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 28 Nov 2024 15:37:08 +0000 Subject: [PATCH] ncm-metaconfig: Fix wrapping and indentation in pan --- .../src/main/pan/components/metaconfig/schema.pan | 8 ++++---- ncm-metaconfig/src/test/resources/commands_fail_pre.pan | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan b/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan index 9ff6b0e834..70a4a7687d 100644 --- a/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan +++ b/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan @@ -157,10 +157,10 @@ type ${project.artifactId}_component = { foreach (esc_fn; srv; SELF['services']) { if (exists(srv['actions'])) { foreach (action; cmd_ref; srv['actions']) { - if (!(exists(SELF['commands']) && exists(SELF['commands'][cmd_ref]))) { - error('Found %s action %s for %s, but no matching command registered', - action, cmd_ref, unescape(esc_fn)); - }; + if (!(exists(SELF['commands']) && exists(SELF['commands'][cmd_ref]))) error( + 'Found %s action %s for %s, but no matching command registered', + action, cmd_ref, unescape(esc_fn), + ); }; }; }; diff --git a/ncm-metaconfig/src/test/resources/commands_fail_pre.pan b/ncm-metaconfig/src/test/resources/commands_fail_pre.pan index b54dcc48ae..e51c7b131b 100644 --- a/ncm-metaconfig/src/test/resources/commands_fail_pre.pan +++ b/ncm-metaconfig/src/test/resources/commands_fail_pre.pan @@ -2,7 +2,8 @@ object template commands_fail_pre; include 'simple_commands'; -"/software/components/metaconfig/commands/cmd_pre_fail" = - "-" + value("/software/components/metaconfig/commands/cmd_pre"); +prefix "/software/components/metaconfig"; -"/software/components/metaconfig/services/{/foo/bar}/actions/pre" = "cmd_pre_fail"; +"commands/cmd_pre_fail" = "-" + value("/software/components/metaconfig/commands/cmd_pre"); + +"services/{/foo/bar}/actions/pre" = "cmd_pre_fail";