Skip to content
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

Jump to bottom

FIX replace 20.04->22.04 in repo URLs #5

Merged
merged 1 commit into from
Oct 2, 2024
Merged

FIX replace 20.04->22.04 in repo URLs #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 dist-upgrader
Open in desktop
Submodule dist-upgrader updated 13 files
+1 −0 pleskdistup/actions/__init__.py
+138 −0 pleskdistup/actions/distupgrade.py
+1 −1 pleskdistup/actions/emails.py
+31 −0 pleskdistup/actions/grub.py
+15 −7 pleskdistup/actions/spamassassin.py
+56 −1 pleskdistup/actions/systemd.py
+28 −10 pleskdistup/common/src/files.py
+4 −2 pleskdistup/common/src/leapp_configs.py
+4 −4 pleskdistup/common/src/motd.py
+1 −1 pleskdistup/common/src/systemd.py
+20 −0 pleskdistup/common/tests/leapp_configs_tests.py
+5 −4 pleskdistup/common/tests/motdtests.py
+11 −0 pleskdistup/main.py
4 changes: 4 additions & 0 deletions ubuntu20to22/upgrader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ def construct_actions(
# we support following PHP versions: PHP 7.1, 7.2, 7.3.
actions.UpdateLegacyPhpRepositories(self._distro_from, self._distro_to),
actions.SetupUbuntuRepositories("focal", "jammy"),
actions.ReplaceAptReposRegexp(
r'(http|https)://([^/]+)/(.*\b)20\.04(\b.*)',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks scary 😆
But ok, let's try this approach

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me replacing strings naively is more scary :)
I expect, at most no-op (transform the string as is) when it could harm.

'\g<1>://\g<2>/\g<3>22.04\g<4>',
),
actions.SwitchPleskRepositories(to_os_version="22.04"),
],
"Dist-upgrade": [
Expand Down
Loading