openstack/training-guides
Code Issues Proposed changes

generatepot-rst.sh: Drop UUID filtering

Browse Source 
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] 993647f316
[2] https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-gettext_uuid

Related-Bug: #2035226
Change-Id: I9ed81d5edefe904fcf7e6f9aed2a00d756299d04
This commit is contained in:
Akihiro Motoki 2023-09-18 17:09:56 +09:00
parent 1521a8784d
commit 31b6059f55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tox.ini
View File

@ -31,8 +31,8 @@ commands =
doc/upstream-training/source/locale/ doc/upstream-training/source/locale/
sphinx-build -b gettext doc/upstream-training/source/website \ sphinx-build -b gettext doc/upstream-training/source/website \
doc/upstream-training/source/locale/ doc/upstream-training/source/locale/
bash -c "msgcat --use-first --sort-by-file doc/upstream-training/source/locale/*.pot | \ 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 && \ > doc/upstream-training/source/upstream-training.pot && \
rm doc/upstream-training/source/locale/*.pot && \ rm doc/upstream-training/source/locale/*.pot && \
rm -rf doc/upstream-training/source/locale/.doctrees/ && \ rm -rf doc/upstream-training/source/locale/.doctrees/ && \
mv doc/upstream-training/source/upstream-training.pot doc/upstream-training/source/locale/upstream-training.pot" mv doc/upstream-training/source/upstream-training.pot doc/upstream-training/source/locale/upstream-training.pot"