merged from upstream for ISO 2022-10

4 files changed, 8 insertions, 9 deletions

diff --git a/profiles/gnome.py b/profiles/gnome.py
index d647ddc8..5e3a8da6 100644
--- a/profiles/gnome.py
+++ b/profiles/gnome.py
@@ -8,8 +8,7 @@ is_top_level_profile = False
 __packages__ = [
 	"gnome",
 	"gnome-tweaks",
-	"gdm",
-	"gnome-software-packagekit-plugin",
+	"gdm"
 ]
 
 
diff --git a/profiles/kde.py b/profiles/kde.py
index 9edbe325..d32bf31b 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -12,7 +12,7 @@ __packages__ = [
 	"ark",
 	"sddm",
 	"plasma-wayland-session",
-	"egl-wayland",
+	"egl-wayland"
 ]
 
 
diff --git a/profiles/server.py b/profiles/server.py
index 21681c2f..f3e32d26 100644
--- a/profiles/server.py
+++ b/profiles/server.py
@@ -33,7 +33,7 @@ def _prep_function(*args, **kwargs):
 	before continuing any further.
 	"""
 	choice = Menu(str(_(
-		'Choose which servers to install, if none then a minimal installation wil be done')),
+		'Choose which servers to install, if none then a minimal installation will be done')),
 		available_servers,
 		preset_values=kwargs['servers'],
 		multi=True
diff --git a/profiles/xorg.py b/profiles/xorg.py
index 2ce8dcc2..de45acd3 100644
--- a/profiles/xorg.py
+++ b/profiles/xorg.py
@@ -47,9 +47,9 @@ if __name__ == 'xorg':
 				for kernel in archinstall.storage['installation_session'].kernels:
 					archinstall.storage['installation_session'].add_additional_packages(f"{kernel}-headers") # Fixes https://github.com/archlinux/archinstall/issues/585
 				archinstall.storage['installation_session'].add_additional_packages("dkms")  # I've had kernel regen fail if it wasn't installed before nvidia-dkms
-				archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit nvidia-dkms")
+				archinstall.storage['installation_session'].add_additional_packages("xorg-server", "xorg-xinit", "nvidia-dkms")
 			else:
-				archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', []))}")
+				archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', []))
 		elif 'amdgpu' in archinstall.storage.get("gfx_driver_packages", []):
 			# The order of these two are important if amdgpu is installed #808
 			if 'amdgpu' in archinstall.storage['installation_session'].MODULES:
@@ -60,9 +60,9 @@ if __name__ == 'xorg':
 				archinstall.storage['installation_session'].MODULES.remove('radeon')
 			archinstall.storage['installation_session'].MODULES.append('radeon')
 
-			archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', []))}")
+			archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', []))
 		else:
-			archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', []))}")
+			archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', []))
 	except Exception as err:
 		archinstall.log(f"Could not handle nvidia and linuz-zen specific situations during xorg installation: {err}", level=logging.WARNING, fg="yellow")
-		archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit")  # Prep didn't run, so there's no driver to install
+		archinstall.storage['installation_session'].add_additional_packages("xorg-server", "xorg-xinit")  # Prep didn't run, so there's no driver to install