Adds compatibility for Oracle Linux #578
Open
+147
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tonioo
reviewed
Jan 9, 2025
| @@ -99,7 +99,7 @@ def install(self, name): | |||
|
|
|||
| def install_many(self, names): | |||
| """Install many packages.""" | |||
| return utils.exec_cmd("yum install -y --quiet {}".format(" ".join(names))) | |||
| return utils.exec_cmd("yum install -y {}".format(" ".join(names))) # Before it was quiet | |||
There was a problem hiding this comment.
Why do you remove the quiet option?
| @@ -90,7 +90,7 @@ class RPMPackage(Package): | |||
| def __init__(self, dist_name): | |||
| """Initialize backend.""" | |||
| super(RPMPackage, self).__init__(dist_name) | |||
| if "centos" in dist_name: | |||
| if dist_name in ["centos", "oracle linux server"]: | |||
There was a problem hiding this comment.
Be careful here, you're changing the check logic for centos. This was not a strict comparison
| @@ -117,7 +117,7 @@ def get_backend(): | |||
| backend = None | |||
| if distname in ["debian", "debian gnu/linux", "ubuntu", "linuxmint"]: | |||
| backend = DEBPackage | |||
| elif "centos" in distname: | |||
| elif distname in ["centos", "oracle linux server"]: | |||
There was a problem hiding this comment.
Be careful here, you're changing the check logic for centos. This was not a strict comparison
| @@ -104,7 +104,7 @@ def get_template_context(self): | |||
| ssl_protocols = "!SSLv3" | |||
| if ssl_protocol_parameter == "ssl_min_protocol": | |||
| ssl_protocols = "TLSv1" | |||
| if "centos" in utils.dist_name(): | |||
| if utils.dist_name() in ["centos", "oracle linux server"]: | |||
There was a problem hiding this comment.
Be careful here, you're changing the check logic for centos. This was not a strict comparison
| @@ -29,7 +29,7 @@ def get_socket_path(self, app): | |||
| def get_template_context(self, app): | |||
| """Additionnal variables.""" | |||
| context = super(Uwsgi, self).get_template_context() | |||
| if package.backend.FORMAT == "deb": | |||
| if package.backend.FORMAT == "deb" or True: | |||
| @@ -286,7 +286,7 @@ def main(input_args): | |||
| ssl_backend.generate_cert() | |||
| for appname in PRIMARY_APPS: | |||
| scripts.install(appname, config, args.upgrade, args.restore) | |||
| system.restart_service("cron") | |||
| system.restart_service("crond") | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the issue/feature this PR addresses:
Current behavior before PR:
Desired behavior after PR is merged: