[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: guix package: Honor the order of profiles when -p appears multipl
From: |
Ludovic Courtès |
Subject: |
01/02: guix package: Honor the order of profiles when -p appears multiple times. |
Date: |
Mon, 23 Jan 2017 21:25:39 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit c5746f239964a72642ac56640b8ff490d5bfa673
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 22 22:25:26 2017 +0100
guix package: Honor the order of profiles when -p appears multiple times.
* guix/scripts/package.scm (process-query): Reverse the order of
PROFILES.
* tests/guix-package-net.sh: Test it with '--search-paths'.
---
guix/scripts/package.scm | 4 ++--
tests/guix-package-net.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 90e7fa2..79622ac 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
;;; Copyright © 2013, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2016 Alex Kost <address@hidden>
@@ -666,7 +666,7 @@ processed, #f otherwise."
(_ #f))
opts)
(() (list %current-profile))
- (lst lst)))
+ (lst (reverse lst))))
(profile (match profiles
((head tail ...) head))))
(match (assoc-ref opts 'query)
diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh
index 35ef6ff..1eff6ab 100644
--- a/tests/guix-package-net.sh
+++ b/tests/guix-package-net.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <address@hidden>
# Copyright © 2013 Nikita Karetnikov <address@hidden>
#
# This file is part of GNU Guix.
@@ -165,7 +165,7 @@ guix package --bootstrap -p "$profile_alt" -i gcc-bootstrap
if guix package -p "$profile" --search-paths | grep LIBRARY_PATH
then false; fi
guix package -p "$profile" -p "$profile_alt" --search-paths \
- | grep "LIBRARY_PATH.*$profile/lib"
+ | grep "LIBRARY_PATH.*$profile/lib.$profile_alt/lib"
#
# Try with the default profile.