GNU bug report logs - #36954
[PATCH] deploy: Use all machine modules when loading deployment

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 36954 in the body.
You can then email your comments to 36954 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: zerodaysfordays <at> sdf.lonestar.org (Jakob L. Kreuze)
To: guix-patches <at> gnu.org
Subject: [PATCH] deploy: Use all machine modules when loading deployment
Date: Wed, 07 Aug 2019 08:43:27 -0400

[Message part 1 (text/plain, inline)]

* guix/scripts/deploy.scm (load-source-file): Enumerate and include all
submodules of (gnu machine) when loading the provided deployment
specification.
---
 guix/scripts/deploy.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index bc1d93a93a..6a67985c8b 100644
--- a/guix/scripts/deploy.scm
+++ b/guix/scripts/deploy.scm
@@ -19,6 +19,7 @@
 
 (define-module (guix scripts deploy)
   #:use-module (gnu machine)
+  #:use-module (guix discovery)
   #:use-module (guix scripts)
   #:use-module (guix scripts build)
   #:use-module (guix store)
@@ -73,7 +74,10 @@ Perform the deployment specified by FILE.\n"))
 
 (define (load-source-file file)
   "Load FILE as a user module."
-  (let ((module (make-user-module '((gnu) (gnu machine) (gnu machine ssh)))))
+  (let* ((guix-path (dirname (search-path %load-path "guix.scm")))
+         (environment-modules (scheme-modules* guix-path "gnu/machine"))
+         (module (make-user-module (append '((gnu) (gnu machine))
+                                           environment-modules))))
     (load* file module)))
 
 (define (guix-deploy . args)
-- 
2.22.0

[signature.asc (application/pgp-signature, inline)]

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Lemmer Webber <cwebber <at> dustycloud.org>
To: guix-patches <at> gnu.org
Cc: 36954-done <at> debbugs.gnu.org
Subject: Re: [bug#36954] [PATCH] deploy: Use all machine modules when loading
 deployment
Date: Wed, 07 Aug 2019 16:07:12 -0400

Merged and pushed, thanks!

Jakob L. Kreuze writes:

> * guix/scripts/deploy.scm (load-source-file): Enumerate and include all
> submodules of (gnu machine) when loading the provided deployment
> specification.
> ---
>  guix/scripts/deploy.scm | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
> index bc1d93a93a..6a67985c8b 100644
> --- a/guix/scripts/deploy.scm
> +++ b/guix/scripts/deploy.scm
> @@ -19,6 +19,7 @@
>  
>  (define-module (guix scripts deploy)
>    #:use-module (gnu machine)
> +  #:use-module (guix discovery)
>    #:use-module (guix scripts)
>    #:use-module (guix scripts build)
>    #:use-module (guix store)
> @@ -73,7 +74,10 @@ Perform the deployment specified by FILE.\n"))
>  
>  (define (load-source-file file)
>    "Load FILE as a user module."
> -  (let ((module (make-user-module '((gnu) (gnu machine) (gnu machine ssh)))))
> +  (let* ((guix-path (dirname (search-path %load-path "guix.scm")))
> +         (environment-modules (scheme-modules* guix-path "gnu/machine"))
> +         (module (make-user-module (append '((gnu) (gnu machine))
> +                                           environment-modules))))
>      (load* file module)))
>  
>  (define (guix-deploy . args)

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.