laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 )
Change subject: Makefile.asciidoc.inc: always run verbose asciidoc ...................................................................... Makefile.asciidoc.inc: always run verbose asciidoc a2x is a "toolchain manager" for asciidoc, that runs the asciidoc command internally. Replace the previous logic of first running a2x without any verbose flags, and on failure running asciidoc standalone, with a verbose flag, to print the errors the occured. Always run a2x with -vv, so it runs asciidoc in verbose mode. This prevents losing the error message in case asciidoc or a2x fail when running with a2x, but then asciidoc succeeds when running standalone. Related: OS#4132 Change-Id: I2cbd2985645ecdecc7851849be6a9a95d4b3246e --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 1bed968..77f3b1d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -73,8 +73,7 @@ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ - a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ - asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1) + a2x -vv $(A2X_OPTS) $(notdir $<) check: $(ASCIIDOC_CHECKS) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I2cbd2985645ecdecc7851849be6a9a95d4b3246e Gerrit-Change-Number: 15030 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osm...@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <lafo...@gnumonks.org> Gerrit-CC: pespin <pes...@sysmocom.de> Gerrit-MessageType: merged