fix: batch non-critical packages in single pacman call, drop old plasma theme, enable filesystem picker
Non-critical packages (Desktop/Plasma group, Utilities) went through try_install which installed them one-at-a-time (45 individual pacman calls). Override operation_try_install in PMPacman to batch all plain-string packages into a single call, matching the behavior of operation_install. Also: - Remove antergos-plasma-theme from rootfs (profile.yaml) and both netinstall Plasma groups - Add allowFileSystemTypeSelection: true to both antergos and minimal partition.conf - Both main.py files (profile + minimal) get the batching fix
This commit is contained in:
@@ -30,3 +30,4 @@ requiredPartitionTableType:
|
||||
|
||||
defaultFileSystemType: "ext4"
|
||||
availableFileSystemTypes: ["ext4","btrfs","f2fs","xfs"]
|
||||
allowFileSystemTypeSelection: true
|
||||
|
||||
@@ -81,7 +81,6 @@
|
||||
description: "KDE Plasma Desktop"
|
||||
selected: true
|
||||
packages:
|
||||
- antergos-plasma-theme
|
||||
- antergos-next-desktop-settings
|
||||
- ark
|
||||
- bluedevil
|
||||
|
||||
@@ -188,6 +188,19 @@ class PMPacman(PackageManager):
|
||||
self.pacman_disable_timeout = pacman.get("disable_download_timeout", False)
|
||||
self.pacman_needed_only = pacman.get("needed_only", False)
|
||||
|
||||
def operation_try_install(self, package_list):
|
||||
if all([isinstance(x, str) for x in package_list]):
|
||||
try:
|
||||
self.install(package_list)
|
||||
except subprocess.CalledProcessError:
|
||||
libcalamares.utils.warning("Could not install batch: %s" % package_list)
|
||||
else:
|
||||
for package in package_list:
|
||||
try:
|
||||
self.install_package(package)
|
||||
except subprocess.CalledProcessError:
|
||||
libcalamares.utils.warning("Could not install package %s" % package)
|
||||
|
||||
def reset_progress(self):
|
||||
self.in_package_changes = False
|
||||
self.progress_fraction = (completed_packages * 1.0 / total_packages)
|
||||
|
||||
@@ -30,3 +30,4 @@ requiredPartitionTableType:
|
||||
|
||||
defaultFileSystemType: "ext4"
|
||||
availableFileSystemTypes: ["ext4","btrfs","f2fs","xfs"]
|
||||
allowFileSystemTypeSelection: true
|
||||
|
||||
@@ -124,7 +124,6 @@
|
||||
description: "KDE Plasma Desktop"
|
||||
selected: false
|
||||
packages:
|
||||
- antergos-plasma-theme
|
||||
- antergos-next-desktop-settings
|
||||
- ark
|
||||
- bluedevil
|
||||
|
||||
@@ -188,6 +188,19 @@ class PMPacman(PackageManager):
|
||||
self.pacman_disable_timeout = pacman.get("disable_download_timeout", False)
|
||||
self.pacman_needed_only = pacman.get("needed_only", False)
|
||||
|
||||
def operation_try_install(self, package_list):
|
||||
if all([isinstance(x, str) for x in package_list]):
|
||||
try:
|
||||
self.install(package_list)
|
||||
except subprocess.CalledProcessError:
|
||||
libcalamares.utils.warning("Could not install batch: %s" % package_list)
|
||||
else:
|
||||
for package in package_list:
|
||||
try:
|
||||
self.install_package(package)
|
||||
except subprocess.CalledProcessError:
|
||||
libcalamares.utils.warning("Could not install package %s" % package)
|
||||
|
||||
def reset_progress(self):
|
||||
self.in_package_changes = False
|
||||
self.progress_fraction = (completed_packages * 1.0 / total_packages)
|
||||
|
||||
@@ -31,7 +31,6 @@ rootfs:
|
||||
- antergos-welcome
|
||||
- yay
|
||||
- antergos-next-desktop-settings
|
||||
- antergos-plasma-theme
|
||||
- pixie-sddm-git
|
||||
- antergos-wallpapers
|
||||
- antergos-grub-theme
|
||||
|
||||
Reference in New Issue
Block a user