packages: Make it clearer what is being installed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/python/bootloaders.py b/src/python/bootloaders.py
index e16a68473ddac65c6c62f39e943808e3ca4370e6..fdecb956ce3735e4e2416e38e77ac890804031d5 100644 (file)
--- 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 46a43312d218ed2784dc0a83b400dc147b919f2a..c517bf3ac1829122d2325961e39bc2fd20d13b0e 100644 (file)
--- 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 7612f3214e95fbf431d20df2759214d6fe865820..e1c8a0a24857e1b722c56a4809551016a456b743 100644 (file)
--- 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)