all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: <pkill9@runbox.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 33806 <33806-done@debbugs.gnu.org>
Subject: [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages.
Date: Mon, 24 Dec 2018 20:04:12 +0000 (GMT)	[thread overview]
Message-ID: <E1gbWST-0005LO-0u@rmmprod07.runbox> (raw)
In-Reply-To: <8736qqq53p.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 781 bytes --]

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’.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-system-Fix-missing-space-in-boot-labels-for-kernels-.patch --]
[-- Type: text/x-patch; name="0001-system-Fix-missing-space-in-boot-labels-for-kernels-.patch", Size: 1046 bytes --]

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


  reply	other threads:[~2018-12-24 20:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-19 20:42 [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages pkill9
2018-12-19 21:56 ` Ludovic Courtès
2018-12-20 14:44   ` pkill9
2018-12-21 15:20     ` bug#33806: " Ludovic Courtès
2018-12-24 20:04       ` pkill9 [this message]
2018-12-26 16:22         ` [bug#33806] " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1gbWST-0005LO-0u@rmmprod07.runbox \
    --to=pkill9@runbox.com \
    --cc=33806-done@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.