GNU bug report logs - #36847
[PATCH] machine: Rename 'system' field.

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 36847 in the body.
You can then email your comments to 36847 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] machine: Rename 'system' field.
Date: Mon, 29 Jul 2019 18:38:35 -0400

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

* gnu/machine.scm (machine-system): Delete variable.
(machine-operating-system): New variable.
* doc/guix.texi (Invoking guix deploy): Use the
'machine-operating-system' accessor rather than 'machine-system'.
---
 doc/guix.texi   |  4 ++--
 gnu/machine.scm | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index ccc36a8a97..cb3778af51 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25507,7 +25507,7 @@ evaluates to.  As an example, @var{file} might contain a definition like this:
             %base-services))))
 
 (list (machine
-       (system %system)
+       (operating-system %system)
        (environment managed-host-environment-type)
        (configuration (machine-ssh-configuration
                        (host-name "localhost")
@@ -25532,7 +25532,7 @@ This is the data type representing a single machine in a heterogeneous Guix
 deployment.
 
 @table @asis
-@item @code{system}
+@item @code{operating-system}
 The object of the operating system configuration to deploy.
 
 @item @code{environment}
diff --git a/gnu/machine.scm b/gnu/machine.scm
index 0b79402b0a..30ae97f6ec 100644
--- a/gnu/machine.scm
+++ b/gnu/machine.scm
@@ -34,7 +34,7 @@
             machine?
             this-machine
 
-            machine-system
+            machine-operating-system
             machine-environment
             machine-configuration
             machine-display-name
@@ -85,14 +85,14 @@
   make-machine
   machine?
   this-machine
-  (system        machine-system)       ; <operating-system>
-  (environment   machine-environment)  ; symbol
-  (configuration machine-configuration ; configuration object
-                 (default #f)))        ; specific to environment
+  (operating-system machine-operating-system) ; <operating-system>
+  (environment      machine-environment)      ; symbol
+  (configuration    machine-configuration     ; configuration object
+                    (default #f)))            ; specific to environment
 
 (define (machine-display-name machine)
   "Return the host-name identifying MACHINE."
-  (operating-system-host-name (machine-system machine)))
+  (operating-system-host-name (machine-operating-system machine)))
 
 (define (machine-remote-eval machine exp)
   "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to
-- 
2.22.0

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

Message #8 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 v2] machine: Rename 'system' field.
Date: Tue, 30 Jul 2019 13:48:32 -0400

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

* gnu/machine.scm (machine-system): Delete variable.
(machine-operating-system): New variable.
All callers changed.
* doc/guix.texi (Invoking guix deploy): Use the
'machine-operating-system' accessor rather than 'machine-system'.
---
 doc/guix.texi       |  4 ++--
 gnu/machine.scm     | 12 ++++++------
 gnu/machine/ssh.scm |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index ccc36a8a97..cb3778af51 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25507,7 +25507,7 @@ evaluates to.  As an example, @var{file} might contain a definition like this:
             %base-services))))
 
 (list (machine
-       (system %system)
+       (operating-system %system)
        (environment managed-host-environment-type)
        (configuration (machine-ssh-configuration
                        (host-name "localhost")
@@ -25532,7 +25532,7 @@ This is the data type representing a single machine in a heterogeneous Guix
 deployment.
 
 @table @asis
-@item @code{system}
+@item @code{operating-system}
 The object of the operating system configuration to deploy.
 
 @item @code{environment}
diff --git a/gnu/machine.scm b/gnu/machine.scm
index 0b79402b0a..30ae97f6ec 100644
--- a/gnu/machine.scm
+++ b/gnu/machine.scm
@@ -34,7 +34,7 @@
             machine?
             this-machine
 
-            machine-system
+            machine-operating-system
             machine-environment
             machine-configuration
             machine-display-name
@@ -85,14 +85,14 @@
   make-machine
   machine?
   this-machine
-  (system        machine-system)       ; <operating-system>
-  (environment   machine-environment)  ; symbol
-  (configuration machine-configuration ; configuration object
-                 (default #f)))        ; specific to environment
+  (operating-system machine-operating-system) ; <operating-system>
+  (environment      machine-environment)      ; symbol
+  (configuration    machine-configuration     ; configuration object
+                    (default #f)))            ; specific to environment
 
 (define (machine-display-name machine)
   "Return the host-name identifying MACHINE."
-  (operating-system-host-name (machine-system machine)))
+  (operating-system-host-name (machine-operating-system machine)))
 
 (define (machine-remote-eval machine exp)
   "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 552eafa9de..d1c90b6313 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent to oldest."
 environment type of 'managed-host."
   (maybe-raise-unsupported-configuration-error machine)
   (mlet %store-monad ((boot-parameters (machine-boot-parameters machine)))
-    (let* ((os (machine-system machine))
+    (let* ((os (machine-operating-system machine))
            (eval (cut machine-remote-eval machine <>))
            (menu-entries (map boot-parameters->menu-entry boot-parameters))
            (bootloader-configuration (operating-system-bootloader os))
-- 
2.22.0

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

Message #11 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: 36847-done <at> debbugs.gnu.org
Subject: Re: [bug#36847] [PATCH v2] machine: Rename 'system' field.
Date: Tue, 06 Aug 2019 15:59:18 -0400

Merged & pushed.

Jakob L. Kreuze writes:

> * gnu/machine.scm (machine-system): Delete variable.
> (machine-operating-system): New variable.
> All callers changed.
> * doc/guix.texi (Invoking guix deploy): Use the
> 'machine-operating-system' accessor rather than 'machine-system'.
> ---
>  doc/guix.texi       |  4 ++--
>  gnu/machine.scm     | 12 ++++++------
>  gnu/machine/ssh.scm |  2 +-
>  3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index ccc36a8a97..cb3778af51 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -25507,7 +25507,7 @@ evaluates to.  As an example, @var{file} might contain a definition like this:
>              %base-services))))
>  
>  (list (machine
> -       (system %system)
> +       (operating-system %system)
>         (environment managed-host-environment-type)
>         (configuration (machine-ssh-configuration
>                         (host-name "localhost")
> @@ -25532,7 +25532,7 @@ This is the data type representing a single machine in a heterogeneous Guix
>  deployment.
>  
>  @table @asis
> -@item @code{system}
> +@item @code{operating-system}
>  The object of the operating system configuration to deploy.
>  
>  @item @code{environment}
> diff --git a/gnu/machine.scm b/gnu/machine.scm
> index 0b79402b0a..30ae97f6ec 100644
> --- a/gnu/machine.scm
> +++ b/gnu/machine.scm
> @@ -34,7 +34,7 @@
>              machine?
>              this-machine
>  
> -            machine-system
> +            machine-operating-system
>              machine-environment
>              machine-configuration
>              machine-display-name
> @@ -85,14 +85,14 @@
>    make-machine
>    machine?
>    this-machine
> -  (system        machine-system)       ; <operating-system>
> -  (environment   machine-environment)  ; symbol
> -  (configuration machine-configuration ; configuration object
> -                 (default #f)))        ; specific to environment
> +  (operating-system machine-operating-system) ; <operating-system>
> +  (environment      machine-environment)      ; symbol
> +  (configuration    machine-configuration     ; configuration object
> +                    (default #f)))            ; specific to environment
>  
>  (define (machine-display-name machine)
>    "Return the host-name identifying MACHINE."
> -  (operating-system-host-name (machine-system machine)))
> +  (operating-system-host-name (machine-operating-system machine)))
>  
>  (define (machine-remote-eval machine exp)
>    "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to
> diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
> index 552eafa9de..d1c90b6313 100644
> --- a/gnu/machine/ssh.scm
> +++ b/gnu/machine/ssh.scm
> @@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent to oldest."
>  environment type of 'managed-host."
>    (maybe-raise-unsupported-configuration-error machine)
>    (mlet %store-monad ((boot-parameters (machine-boot-parameters machine)))
> -    (let* ((os (machine-system machine))
> +    (let* ((os (machine-operating-system machine))
>             (eval (cut machine-remote-eval machine <>))
>             (menu-entries (map boot-parameters->menu-entry boot-parameters))
>             (bootloader-configuration (operating-system-bootloader os))

Previous Next

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