[bug#33806] system: 'kernel->boot-label' now accepts inferior packages.

Message ID E1gbWST-0005LO-0u@rmmprod07.runbox
State Accepted
Headers show
Series [bug#33806] system: 'kernel->boot-label' now accepts inferior packages. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

pkill9 Dec. 24, 2018, 8:04 p.m. UTC
I forgot to add a space between the inferior's package name and package version, I've attached a patch that fixes this.

On Fri, 21 Dec 2018 16:20:10 +0100, Ludovic Courtès <ludo@gnu.org> wrote:

> Hi,
> 
> <pkill9@runbox.com> skribis:
> 
> > From 0e86c0708f3aa0eb35a9fc3c9ef89dcb210bac3f Mon Sep 17 00:00:00 2001
> > From: Pkill -9 <pkill9@runbox.com>
> > Date: Wed, 19 Dec 2018 20:22:20 +0000
> > Subject: [PATCH] system: 'kernel->boot-label' now accepts inferior packages.
> >
> > * gnu/system.scm (kernel->boot-label): Get package name and version
> > using the functions for inferior packages if the kernel is an
> > inferior package. Return "GNU" if the kernel is not a package.
> 
> I adjusted the indentation and applied.  Thank you!
> 
> Ludo’.

Comments

Ludovic Courtès Dec. 26, 2018, 4:22 p.m. UTC | #1
<pkill9@runbox.com> skribis:

> From c1525fa51129f00133f108c020cc27af34f08d0e Mon Sep 17 00:00:00 2001
> From: Pkill -9 <pkill9@runbox.com>
> Date: Mon, 24 Dec 2018 19:52:59 +0000
> Subject: [PATCH] system: Fix missing space in boot labels for kernels that are
>  inferior packages
>
> * gnu/system.scm (kernel->boot-label): Add a missing space between
> the kernel's package name and package version for inferior packages.

Applied, thanks!

Patch

From c1525fa51129f00133f108c020cc27af34f08d0e Mon Sep 17 00:00:00 2001
From: Pkill -9 <pkill9@runbox.com>
Date: Mon, 24 Dec 2018 19:52:59 +0000
Subject: [PATCH] system: Fix missing space in boot labels for kernels that are
 inferior packages

* gnu/system.scm (kernel->boot-label): Add a missing space between
the kernel's package name and package version for inferior packages.
---
 gnu/system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 146af7cf0..ee48f4826 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -913,7 +913,7 @@  listed in OS.  The C library expects to find it under
                         " (beta)"))
         ((inferior-package? kernel)
          (string-append "GNU with "
-                        (string-titlecase (inferior-package-name kernel))
+                        (string-titlecase (inferior-package-name kernel)) " "
                         (inferior-package-version kernel)
                         " (beta)"))
         (else "GNU")))
-- 
2.20.1