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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Christopher Lemmer Webber <cwebber <at> dustycloud.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#36954: closed ([PATCH] deploy: Use all machine modules when
 loading deployment)
Date: Wed, 07 Aug 2019 20:08:02 +0000

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

Your message dated Wed, 07 Aug 2019 16:07:12 -0400
with message-id <87wofooi33.fsf <at> dustycloud.org>
and subject line Re: [bug#36954] [PATCH] deploy: Use all machine modules when loading deployment
has caused the debbugs.gnu.org bug report #36954,
regarding [PATCH] deploy: Use all machine modules when loading deployment
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
36954: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=36954
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

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 3 (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 part 5 (message/rfc822, inline)]

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.