Skip to content

Fixed mistake in include_snippet macro #3450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craigcomstock merged 2 commits into from
Jun 25, 2025
Merged

Fixed mistake in include_snippet macro #3450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302fef1
Added some more logging to debug build failures
olehermanse Jun 25, 2025
7eda86e
Fixed mistake in include_snippet macro
olehermanse Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cheatsheet.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ Sometimes it's nice to include a snippet from another file. For example, we dyna

`[%CFEngine_include_snippet(cf-promises.help, [\s]*--[a-z], ^$)%]`

[%CFEngine_include_snippet(cf-promises.help, [\s]\*--[a-z], ^$)%]
[%CFEngine_include_snippet(cf-promises.help, [\s]*--[a-z], ^$)%]

---

Expand Down
1 change: 1 addition & 0 deletions generator/_regenerate_json.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ done
) | while read agent
do
dumpHelp ${agent} > ${OUTDIR}/${agent}.help
echo "Dumped help output for ${agent} to ${OUTDIR}/${agent}.help"
done

# Here we execute and store some command output so that examples can always be up to date.
Expand Down
4 changes: 4 additions & 0 deletions generator/_scripts/cfdoc_macros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,10 @@ def include_snippet(parameters, config):
markdown_lines.append(line)

if not len(markdown_lines):
print("Did not find expected content in %s" % filename)
print("Full content of file:")
for line in lines:
print(line, end="")
raise Exception("Snippet not found: %s" % begin.pattern)
return list()

Expand Down