diff mbox series

[bug#45028] offload: Print warning in context.

Message ID 20201203205237.3f80576f@tachikoma.lepiller.eu
State Accepted
Headers show
Series [bug#45028] offload: Print warning in context. | expand

Checks

Context Check Description
cbaines/submitting builds success
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Julien Lepiller Dec. 3, 2020, 7:52 p.m. UTC 
Hi Guix, attached is a patch to add context to the warning about the
system field. When offloading, we get this message if we haven't
updated our machines.scm:

guix offload: warning: The 'system' field is deprecated, please use
'systems' instead.

and it's not clear what system field this message is refering to
(especially for me, since I simply re-enabled offloading after a few
months by copying my old backup machines.scm).

Now the message is:

/etc/guix/machines.scm:9:6: warning: The 'system' field is deprecated,
please use 'systems' instead.

which directs the user to the right file, and line (so if you have many
offload machines, you know where to fix).

Since the message comes from the daemon, you need to run the daemon
from your guix checkout to test the patch.

Comments

Ludovic Courtès Dec. 14, 2020, 8:41 a.m. UTC | #1 
Hi Julien,

Julien Lepiller <julien@lepiller.eu> skribis:

> From d29c55f67c63c6fe49a4febd7999640a0dab2a55 Mon Sep 17 00:00:00 2001
> From: Julien Lepiller <julien@lepiller.eu>
> Date: Thu, 3 Dec 2020 20:22:50 +0100
> Subject: [PATCH] offload: Print warning in context.
>
> * guix/scripts/offload.scm (build-machine): Add `location` field.
> (build-machine-system): Print location with warning.

LGTM!

Thanks,
Ludo’.
Julien Lepiller Dec. 15, 2020, 2:04 p.m. UTC | #2 
Pushed as 954e4cf6a4cc67701dff8d089e8e02861e3b36c2, thank you!
diff mbox series

Patch

From d29c55f67c63c6fe49a4febd7999640a0dab2a55 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 3 Dec 2020 20:22:50 +0100
Subject: [PATCH] offload: Print warning in context.

* guix/scripts/offload.scm (build-machine): Add `location` field.
(build-machine-system): Print location with warning.
---
 guix/scripts/offload.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index 6366556647..58ee53e85c 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,7 @@ 
             build-machine-overload-threshold
             build-machine-systems
             build-machine-features
+            build-machine-location
 
             build-requirements
             build-requirements?
@@ -112,11 +114,17 @@ 
   (speed           build-machine-speed            ; inexact real
                    (default 1.0))
   (features        build-machine-features         ; list of strings
-                   (default '())))
+                   (default '()))
+  (location        build-machine-location
+                   (default (and=> (current-source-location)
+                                   source-properties->location))
+                   (innate)))
 
 ;;; Deprecated.
 (define (build-machine-system machine)
-  (warning (G_ "The 'system' field is deprecated, \
+  (warning
+    (build-machine-location machine)
+    (G_ "The 'system' field is deprecated, \
 please use 'systems' instead.~%"))
   (%build-machine-system machine))
 
-- 
2.29.2