Skip to content

Commit

Permalink
Merge pull request #8 from plesk/one-function-for-repository-files-up…
Browse files Browse the repository at this point in the history
…date

Make all repository changes at once for consistency by using a new action
  • Loading branch information
SandakovMM authored Jan 17, 2025
2 parents fefb590 + 72be787 commit 8977846
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion dist-upgrader
Submodule dist-upgrader updated 71 files
+1 −1 BUCK
+1 −1 LICENSE
+1 −1 buck.defs.py
+1 −1 pleskdistup/BUCK
+1 −1 pleskdistup/__init__.py
+2 −1 pleskdistup/actions/__init__.py
+1 −1 pleskdistup/actions/common.py
+1 −1 pleskdistup/actions/common_checks.py
+93 −1 pleskdistup/actions/distupgrade.py
+1 −1 pleskdistup/actions/emails.py
+1 −1 pleskdistup/actions/extensions.py
+1 −1 pleskdistup/actions/grub.py
+1 −1 pleskdistup/actions/mariadb.py
+64 −0 pleskdistup/actions/mounts.py
+1 −1 pleskdistup/actions/packages.py
+1 −1 pleskdistup/actions/plesk.py
+1 −1 pleskdistup/actions/spamassassin.py
+3 −2 pleskdistup/actions/systemd.py
+1 −1 pleskdistup/common/BUCK
+1 −1 pleskdistup/common/LICENSE
+3 −1 pleskdistup/common/src/__init__.py
+1 −1 pleskdistup/common/src/action.py
+1 −1 pleskdistup/common/src/dist.py
+1 −1 pleskdistup/common/src/dns.py
+1 −1 pleskdistup/common/src/dpkg.py
+1 −1 pleskdistup/common/src/feedback.py
+1 −1 pleskdistup/common/src/files.py
+1 −1 pleskdistup/common/src/leapp_configs.py
+1 −1 pleskdistup/common/src/log.py
+18 −4 pleskdistup/common/src/mariadb.py
+1 −1 pleskdistup/common/src/motd.py
+48 −0 pleskdistup/common/src/mounts.py
+1 −1 pleskdistup/common/src/packages.py
+1 −1 pleskdistup/common/src/php.py
+1 −1 pleskdistup/common/src/plesk.py
+1 −1 pleskdistup/common/src/postgres.py
+4 −1 pleskdistup/common/src/rpm.py
+22 −0 pleskdistup/common/src/strings.py
+1 −1 pleskdistup/common/src/systemd.py
+1 −1 pleskdistup/common/src/util.py
+1 −1 pleskdistup/common/src/version.py
+1 −1 pleskdistup/common/src/writers.py
+1 −1 pleskdistup/common/tests/actionstests.py
+1 −1 pleskdistup/common/tests/distrotests.py
+1 −1 pleskdistup/common/tests/dnstests.py
+1 −1 pleskdistup/common/tests/feedbacktests.py
+1 −1 pleskdistup/common/tests/filestests.py
+1 −1 pleskdistup/common/tests/leapp_configs_tests.py
+1 −1 pleskdistup/common/tests/logtests.py
+15 −9 pleskdistup/common/tests/mariadbtests.py
+1 −1 pleskdistup/common/tests/motdtests.py
+92 −0 pleskdistup/common/tests/mountstests.py
+1 −1 pleskdistup/common/tests/phptests.py
+1 −1 pleskdistup/common/tests/plesktests.py
+1 −1 pleskdistup/common/tests/rpmtests.py
+78 −0 pleskdistup/common/tests/stringstest.py
+1 −1 pleskdistup/common/tests/test_main.py
+1 −1 pleskdistup/common/tests/testcase.py
+1 −1 pleskdistup/common/tests/utiltests.py
+1 −1 pleskdistup/common/tests/versiontests.py
+1 −1 pleskdistup/config.py
+1 −1 pleskdistup/convert.py
+1 −1 pleskdistup/debian/__init__.py
+4 −2 pleskdistup/main.py
+1 −1 pleskdistup/messages.py
+1 −1 pleskdistup/phase.py
+1 −1 pleskdistup/registry.py
+1 −1 pleskdistup/resume.py
+1 −1 pleskdistup/ubuntu/__init__.py
+1 −1 pleskdistup/upgrader.py
+1 −1 product.defs.py
10 changes: 5 additions & 5 deletions ubuntu20to22/upgrader.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import typing

from pleskdistup import actions
from pleskdistup.common import action, feedback, php, version
from pleskdistup.common import action, feedback, php, version, strings
from pleskdistup.phase import Phase
from pleskdistup.upgrader import dist, DistUpgrader, DistUpgraderFactory, PathType

Expand Down Expand Up @@ -112,10 +112,10 @@ def construct_actions(
# UpdateLegacyPhpRepositories specific for distupgrades where
# 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.*)',
'\g<1>://\g<2>/\g<3>22.04\g<4>',
actions.AdoptAptRepositoriesUbuntu([
strings.create_replace_string_function('focal', 'jammy'),
strings.create_replace_regexp_function(r'(http|https)://([^/]+)/(.*\b)20\.04(\b.*)', '\g<1>://\g<2>/\g<3>22.04\g<4>')
], name="modify apt repositories to new OS"
),
actions.SwitchPleskRepositories(to_os_version="22.04"),
],
Expand Down

0 comments on commit 8977846

Please sign in to comment.