From 29ea959ca76e738d246a8b392e999e7882a65c2b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Dec 2021 13:42:56 +0000
Subject: [PATCH] packages: Make it clearer what is being installed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/python/bootloaders.py |  3 ++-
 src/python/packages.py    |  8 +++++++-
 src/python/step.py        | 12 ++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/python/bootloaders.py b/src/python/bootloaders.py
index e16a684..fdecb95 100644
--- a/src/python/bootloaders.py
+++ b/src/python/bootloaders.py
@@ -137,7 +137,8 @@ class InstallBootloader(step.Step):
 			packages += bootloader.packages
 
 		# Install them
-		self.install_packages(packages)
+		if packages:
+			self.install_packages(packages, title=_("Installing Bootloader"))
 
 		# Install all bootloaders
 		for bootloader in self.bricklayer.bootloaders:
diff --git a/src/python/packages.py b/src/python/packages.py
index 46a4331..c517bf3 100644
--- a/src/python/packages.py
+++ b/src/python/packages.py
@@ -19,10 +19,16 @@
 ###############################################################################
 
 from . import step
+from .i18n import _
 
 class InstallPackages(step.Step):
 	def run(self):
 		# Get list of all packages to be installed
 		packages = self.bricklayer.settings.get("packages", [])
 
-		self.install_packages(packages)
+		try:
+			title = _("Installing %(PRETTY_NAME)s") % self.bricklayer.os
+		except KeyError:
+			title = _("Installing Base System")
+
+		self.install_packages(packages, title=title)
diff --git a/src/python/step.py b/src/python/step.py
index 7612f32..e1c8a0a 100644
--- a/src/python/step.py
+++ b/src/python/step.py
@@ -63,17 +63,17 @@ class Step(object):
 		"""
 		pass
 
-	def install_packages(self, packages):
+	def install_packages(self, packages, title=None):
 		# Nothing to do if there are no packages
 		if not packages:
 			return
 
+		# Set a useful title if none is set
+		if not title:
+			title = _("Installing Packages")
+
 		# Set up Pakfire
-		with self.tui.progress(
-			_("Installing Packages"),
-			_("Installing packages..."),
-			max_value=100,
-		) as t:
+		with self.tui.progress(title, _("Installing packages..."), max_value=100) as t:
 			# Create a new Pakfire instance
 			p = self.bricklayer.setup_pakfire(**t.callbacks)
 
-- 
2.47.2