locale_gen: fix/improvements #9238

russoz · 2024-12-12T03:44:25Z

SUMMARY

It introduces a RV mechanism that declares the mode in a more descriptive way:

ubuntu_mode	mechanism
False	glibc
True	debian

Refer to #9131 (comment) for a more complete rationale.

Change the logic to determine whether ubuntu_mode is True or False.

Formerly it would:

set ubuntu_mode=True if /var/lib/locales/supported.d existed,
else False if /etc/locale.gen exists,
else raising an error.

With this PR it will:

set ubuntu_mode=False is /etc/locale.gen is present,
else True if the /var/lib/... directory exists,
else error.

Canonical made a deliberate decision to move towards the glibc support, so all Ubuntu versions since 16.04 have /etc/locale.gen. I have tested locally in Debian 11 and 12 and both of them worked using glibc mode.

The PR will include tests forcing ubuntu_mode=True.

Fixes #8487 #9131

ISSUE TYPE

Bugfix Pull Request
Refactoring Pull Request

COMPONENT NAME

locale_gen

ansibullbot · 2024-12-12T03:47:15Z

cc @AugustusKling
click here for bot help

russoz · 2024-12-23T02:53:56Z

Hi @ltog @samikhelil83 @lukasz-zaroda

Could you please review the PR? Thanks in advance!

Happy holidays!

changelogs/fragments/9131-locale-gen-rewrite.yml

- test is failing

- add changelog fragment - improved docs

russoz · 2024-12-29T20:03:17Z

Rebased

plugins/modules/locale_gen.py

Co-authored-by: Felix Fontein <[email protected]>

felixfontein

Besides these two details, it looks good!

changelogs/fragments/9238-locale-gen-rewrite.yml

plugins/modules/locale_gen.py

Co-authored-by: Felix Fontein <[email protected]>

changelogs/fragments/9238-locale-gen-rewrite.yml

plugins/modules/locale_gen.py

Co-authored-by: Felix Fontein <[email protected]>

patchback · 2024-12-30T20:54:54Z

Backport to stable-9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 6bb7a1c on top of patchback/backports/stable-9/6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2/pr-9238

Backporting merged PR #9238 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible-collections/community.general.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-9/6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2/pr-9238 upstream/stable-9

Now, cherry-pick PR locale_gen: fix/improvements #9238 contents into that branch:
```
$ git cherry-pick -x 6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2
```
If it'll yell at you with something like fatal: Commit 6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR locale_gen: fix/improvements #9238 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-9/6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2/pr-9238

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

felixfontein · 2024-12-30T20:55:00Z

@russoz thanks for improving/fixing this!

patchback · 2024-12-30T20:55:01Z

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/6bb7a1cc735eb7f7ca1907d5a3cc0797ff7fa8f2/pr-9238

Backported as #9481

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

* locale_gen: fix/improvements * fix sanity * add RV doc * add integration test forcing mechanism=debian - test is failing * fix RETURN doc * reformat yaml * comment out the test for ubuntu_mode=True * multiple changes: - add changelog fragment - improved docs * normalize docs after rebasing * Update changelogs/fragments/9131-locale-gen-rewrite.yml * apply recommendations from review * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> * Update changelogs/fragments/9238-locale-gen-rewrite.yml Co-authored-by: Felix Fontein <[email protected]> * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> --------- Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit 6bb7a1c)

…9481) locale_gen: fix/improvements (#9238) * locale_gen: fix/improvements * fix sanity * add RV doc * add integration test forcing mechanism=debian - test is failing * fix RETURN doc * reformat yaml * comment out the test for ubuntu_mode=True * multiple changes: - add changelog fragment - improved docs * normalize docs after rebasing * Update changelogs/fragments/9131-locale-gen-rewrite.yml * apply recommendations from review * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> * Update changelogs/fragments/9238-locale-gen-rewrite.yml Co-authored-by: Felix Fontein <[email protected]> * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> --------- Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit 6bb7a1c) Co-authored-by: Alexei Znamensky <[email protected]>

* locale_gen: fix/improvements * fix sanity * add RV doc * add integration test forcing mechanism=debian - test is failing * fix RETURN doc * reformat yaml * comment out the test for ubuntu_mode=True * multiple changes: - add changelog fragment - improved docs * normalize docs after rebasing * Update changelogs/fragments/9131-locale-gen-rewrite.yml * apply recommendations from review * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> * Update changelogs/fragments/9238-locale-gen-rewrite.yml Co-authored-by: Felix Fontein <[email protected]> * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> * Update plugins/modules/locale_gen.py Co-authored-by: Felix Fontein <[email protected]> --------- Co-authored-by: Felix Fontein <[email protected]>

ansibullbot added WIP Work in progress bug This issue/PR relates to a bug module module plugins plugin (any type) labels Dec 12, 2024

felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch labels Dec 14, 2024

This comment was marked as resolved.

Sign in to view

ansibullbot added integration tests/integration tests tests labels Dec 16, 2024

This comment was marked as resolved.

Sign in to view

russoz force-pushed the locale-gen-rewrite branch from 0bff56e to 2840fd3 Compare December 16, 2024 03:46

This comment was marked as resolved.

Sign in to view

russoz changed the title ~~[WIP] locale_gen: fix/improvements~~ locale_gen: fix/improvements Dec 23, 2024

russoz requested a review from felixfontein December 23, 2024 02:52

ansibullbot removed the WIP Work in progress label Dec 23, 2024

russoz force-pushed the locale-gen-rewrite branch from 763d6fc to 23eb438 Compare December 26, 2024 10:23

russoz commented Dec 26, 2024

View reviewed changes

changelogs/fragments/9131-locale-gen-rewrite.yml Outdated Show resolved Hide resolved

russoz and others added 10 commits December 30, 2024 09:03

locale_gen: fix/improvements

3a4b25a

fix sanity

2fd637d

add RV doc

62362dc

add integration test forcing mechanism=debian

b754152

- test is failing

fix RETURN doc

b1f39d7

reformat yaml

231e8cb

comment out the test for ubuntu_mode=True

4f7136a

multiple changes:

1521346

- add changelog fragment - improved docs

normalize docs after rebasing

de94f4f

Update changelogs/fragments/9131-locale-gen-rewrite.yml

7d2b53d

russoz force-pushed the locale-gen-rewrite branch from 68af963 to 7d2b53d Compare December 29, 2024 20:03

felixfontein reviewed Dec 29, 2024

View reviewed changes

plugins/modules/locale_gen.py Outdated Show resolved Hide resolved

plugins/modules/locale_gen.py Outdated Show resolved Hide resolved

plugins/modules/locale_gen.py Outdated Show resolved Hide resolved

plugins/modules/locale_gen.py Outdated Show resolved Hide resolved

russoz and others added 2 commits December 30, 2024 11:33

apply recommendations from review

dd68bc2

Update plugins/modules/locale_gen.py

526c610

Co-authored-by: Felix Fontein <[email protected]>

felixfontein reviewed Dec 30, 2024

View reviewed changes

changelogs/fragments/9238-locale-gen-rewrite.yml Outdated Show resolved Hide resolved

plugins/modules/locale_gen.py Outdated Show resolved Hide resolved

russoz and others added 2 commits December 31, 2024 07:28

Update changelogs/fragments/9238-locale-gen-rewrite.yml

9c153e2

Co-authored-by: Felix Fontein <[email protected]>

Update plugins/modules/locale_gen.py

f45244b

Co-authored-by: Felix Fontein <[email protected]>

felixfontein reviewed Dec 30, 2024

View reviewed changes

changelogs/fragments/9238-locale-gen-rewrite.yml Show resolved Hide resolved

plugins/modules/locale_gen.py Show resolved Hide resolved

Update plugins/modules/locale_gen.py

ee3ccc3

Co-authored-by: Felix Fontein <[email protected]>

ansibullbot added the needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI label Dec 30, 2024

felixfontein approved these changes Dec 30, 2024

View reviewed changes

felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Dec 30, 2024

felixfontein merged commit 6bb7a1c into ansible-collections:main Dec 30, 2024
129 checks passed

patchback bot mentioned this pull request Dec 30, 2024

[PR #9238/6bb7a1cc backport][stable-10] locale_gen: fix/improvements #9481

Merged

felixfontein removed the backport-9 Automatically create a backport for the stable-9 branch label Dec 30, 2024

russoz deleted the locale-gen-rewrite branch December 30, 2024 21:07

russoz mentioned this pull request Dec 30, 2024

locale_gen: de_CH.UTF-8 not being created on Ubuntu 24.04 #9131

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

locale_gen: fix/improvements #9238

locale_gen: fix/improvements #9238

russoz commented Dec 12, 2024 •

edited

Loading

ansibullbot commented Dec 12, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

russoz commented Dec 23, 2024

russoz commented Dec 29, 2024

felixfontein left a comment

patchback bot commented Dec 30, 2024 •

edited

Loading

felixfontein commented Dec 30, 2024

patchback bot commented Dec 30, 2024 •

edited

Loading

locale_gen: fix/improvements #9238

locale_gen: fix/improvements #9238

Conversation

russoz commented Dec 12, 2024 • edited Loading

SUMMARY

ISSUE TYPE

COMPONENT NAME

ansibullbot commented Dec 12, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

russoz commented Dec 23, 2024

russoz commented Dec 29, 2024

felixfontein left a comment

Choose a reason for hiding this comment

patchback bot commented Dec 30, 2024 • edited Loading

Backport to stable-9: 💔 cherry-picking failed — conflicts found

Backporting merged PR #9238 into main

felixfontein commented Dec 30, 2024

patchback bot commented Dec 30, 2024 • edited Loading

Backport to stable-10: 💚 backport PR created

russoz commented Dec 12, 2024 •

edited

Loading

patchback bot commented Dec 30, 2024 •

edited

Loading

patchback bot commented Dec 30, 2024 •

edited

Loading