diff mbox series

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

Message ID E1gZzYT-0001d0-AD@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. 20, 2018, 2:44 p.m. UTC 
Ok, I've updated the patch, thanks.


On Wed, 19 Dec 2018 22:56:08 +0100, Ludovic Courtès <ludo@gnu.org> wrote:

> Hello,
> 
> <pkill9@runbox.com> skribis:
> 
> > From 6c0bbaa0a73f4c6043211df6af100877dc9a4094 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 not a
> > regular package.
> 
> [...]
> 
> >  (define (kernel->boot-label kernel)
> >    "Return a label for the bootloader menu entry that boots KERNEL."
> > -  (string-append "GNU with "
> > -                 (string-titlecase (package-name kernel)) " "
> > -                 (package-version kernel)
> > -                 " (beta)"))
> > +  (if (package? kernel)
> > +      (string-append "GNU with "
> > +                     (string-titlecase (package-name kernel)) " "
> > +                     (package-version kernel)
> > +                     " (beta)")
> > +      (string-append "GNU with "
> > +                     (string-titlecase (inferior-package-name kernel))
> > +                     (inferior-package-version kernel)
> > +                     " (beta)")))
> 
> I’d suggest writing it as:
> 
>   (cond ((package? kernel) …)
>         ((inferior-package? kernel) …)
>         (else "GNU"))
> 
> Could you send an updated patch?
> 
> Of course this is also where we start wondering whether <package> and
> <inferior-package> should simply inherit from a common class of which
> ‘package-name’ would be a method…
> 
> In this case I think it’s OK to do things this way, especially because
> the kernel could also be a non-package file-like object.
> 
> Thanks,
> Ludo’.

Comments

Ludovic Courtès Dec. 21, 2018, 3:20 p.m. UTC | #1 
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’.
diff mbox series

Patch

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.
---
 gnu/system.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index a5a8f40d6..0c296bc9a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -21,6 +21,7 @@ 
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu system)
+  #:use-module (guix inferior)
   #:use-module (guix store)
   #:use-module (guix monads)
   #:use-module (guix gexp)
@@ -905,10 +906,17 @@  listed in OS.  The C library expects to find it under
 
 (define (kernel->boot-label kernel)
   "Return a label for the bootloader menu entry that boots KERNEL."
-  (string-append "GNU with "
-                 (string-titlecase (package-name kernel)) " "
-                 (package-version kernel)
-                 " (beta)"))
+  (cond ((package? kernel)
+           (string-append "GNU with "
+                          (string-titlecase (package-name kernel)) " "
+                          (package-version kernel)
+                          " (beta)"))
+        ((inferior-package? kernel)
+           (string-append "GNU with "
+                          (string-titlecase (inferior-package-name kernel))
+                          (inferior-package-version kernel)
+                          " (beta)"))
+        (else "GNU")))
 
 (define (store-file-system file-systems)
   "Return the file system object among FILE-SYSTEMS that contains the store."
-- 
2.19.2