From 31b6059f55675ee9d5f1d04b57227ae48e479d51 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Mon, 18 Sep 2023 17:09:56 +0900 Subject: [PATCH] generatepot-rst.sh: Drop UUID filtering tools/generatepot-rst.sh has an awk filter to drop UUID from POT files, but it is unnecessary now. It was introduced to strip UUID information which was added by default in Sphinx <1.3 [1] in openstack-manuals. Sphinx >=1.3 does not output UUID information by default [2], so is is no longer needed. In addition, (g)awk 5.0 or later (adopted in Ubuntu 20.04 or later) complains the current awk regexp. I think it is the time to drop it rather than fixing the regexp. [1] https://opendev.org/openstack/openstack-manuals/commit/993647f316fbe33a513baffb5cc4ad156355da8a [2] https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-gettext_uuid Related-Bug: #2035226 Change-Id: I9ed81d5edefe904fcf7e6f9aed2a00d756299d04 --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index baab4a6d..cb0089d3 100644 --- a/tox.ini +++ b/tox.ini @@ -31,8 +31,8 @@ commands = doc/upstream-training/source/locale/ sphinx-build -b gettext doc/upstream-training/source/website \ doc/upstream-training/source/locale/ - bash -c "msgcat --use-first --sort-by-file doc/upstream-training/source/locale/*.pot | \ - awk '$0 !~ /^\# [a-z0-9]+$/' > doc/upstream-training/source/upstream-training.pot && \ + bash -c "msgcat --use-first --sort-by-file doc/upstream-training/source/locale/*.pot \ + > doc/upstream-training/source/upstream-training.pot && \ rm doc/upstream-training/source/locale/*.pot && \ rm -rf doc/upstream-training/source/locale/.doctrees/ && \ mv doc/upstream-training/source/upstream-training.pot doc/upstream-training/source/locale/upstream-training.pot"