Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/default_profiles
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2023-05-12 02:30:09 +1000
committerGitHub <noreply@github.com>2023-05-11 18:30:09 +0200
commit89cefb9a1c7d4c4968e7d8645149078e601c9d1c (patch)
tree12c84bdcef1b0ef3f8a21977e25c7f0f89388138 /archinstall/default_profiles
parent6e6b850a8f687b193172aaa321d49bd2956c1d4f (diff)
Cleanup imports and unused code (#1801)
* Cleanup imports and unused code * Update build check * Keep deprecation exception * Simplify logging --------- Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Diffstat (limited to 'archinstall/default_profiles')
-rw-r--r--archinstall/default_profiles/desktop.py4
-rw-r--r--archinstall/default_profiles/server.py9
2 files changed, 6 insertions, 7 deletions
diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py
index 2351bd08..9d92f822 100644
--- a/archinstall/default_profiles/desktop.py
+++ b/archinstall/default_profiles/desktop.py
@@ -1,7 +1,7 @@
from typing import Any, TYPE_CHECKING, List, Optional, Dict
from archinstall.lib import menu
-from archinstall.lib.output import log
+from archinstall.lib.output import info
from archinstall.lib.profile.profiles_handler import profile_handler
from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult, GreeterType
@@ -79,7 +79,7 @@ class DesktopProfile(Profile):
install_session.add_additional_packages(self.packages)
for profile in self._current_selection:
- log(f'Installing profile {profile.name}...')
+ info(f'Installing profile {profile.name}...')
install_session.add_additional_packages(profile.packages)
install_session.enable_service(profile.services)
diff --git a/archinstall/default_profiles/server.py b/archinstall/default_profiles/server.py
index e240b3ef..ab758975 100644
--- a/archinstall/default_profiles/server.py
+++ b/archinstall/default_profiles/server.py
@@ -1,7 +1,6 @@
-import logging
from typing import Any, TYPE_CHECKING, List
-from archinstall.lib.output import log
+from archinstall.lib.output import info
from archinstall.lib.menu import MenuSelectionType
from archinstall.lib.profile.profiles_handler import profile_handler
from archinstall.default_profiles.profile import ProfileType, Profile, SelectResult, TProfile
@@ -46,12 +45,12 @@ class ServerProfile(Profile):
def install(self, install_session: 'Installer'):
server_info = self.current_selection_names()
details = ', '.join(server_info)
- log(f'Now installing the selected servers: {details}', level=logging.INFO)
+ info(f'Now installing the selected servers: {details}')
for server in self._current_selection:
- log(f'Installing {server.name}...', level=logging.INFO)
+ info(f'Installing {server.name}...')
install_session.add_additional_packages(server.packages)
install_session.enable_service(server.services)
server.install(install_session)
- log('If your selections included multiple servers with the same port, you may have to reconfigure them.', fg="yellow", level=logging.INFO)
+ info('If your selections included multiple servers with the same port, you may have to reconfigure them.')