01/04: environment: Allow compilation with Guile 2.2.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 9ce78f27a02b3a5fcaea2f0633404b940795989a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 1 11:12:11 2021 +0100

    environment: Allow compilation with Guile 2.2.
    
    Fixes <https://bugs.gnu.org/46826>.
    Reported by cage <cage-dev@twistfold.it>.
    
    * guix/scripts/environment.scm (guix-environment): Move 'manifest'
    definition before expression.
---
 guix/scripts/environment.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index a393477..0360761 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2018 David Thompson <davet@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
 ;;; Copyright © 2018 Mike Gerwitz <mtg@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -745,14 +745,15 @@ message if any test fails."
           (with-status-verbosity (assoc-ref opts 'verbosity)
             (define manifest-from-opts
               (options/resolve-packages store opts))
-            (when (and profile
-                       (> (length (manifest-entries manifest-from-opts)) 0))
-              (leave (G_ "'--profile' cannot be used with package options~%")))
 
             (define manifest
               (if profile
-                (profile-manifest profile)
-                manifest-from-opts))
+                  (profile-manifest profile)
+                  manifest-from-opts))
+
+            (when (and profile
+                       (> (length (manifest-entries manifest-from-opts)) 0))
+              (leave (G_ "'--profile' cannot be used with package options~%")))
 
             (set-build-options-from-command-line store opts)