From: "Ludovic Courtès" <ludo@gnu.org>
To: 25422@debbugs.gnu.org
Subject: bug#25422: [PATCH 1/2] guix package: Honor the order of profiles when -p appears multiple times.
Date: Sun, 22 Jan 2017 22:52:00 +0100 [thread overview]
Message-ID: <20170122215201.7948-2-ludo@gnu.org> (raw)
In-Reply-To: <20170122215201.7948-1-ludo@gnu.org>
* 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 90e7fa229..79622ac14 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 <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
@@ -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 35ef6ff1a..1eff6abba 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 <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
#
# 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.
--
2.11.0
next prev parent reply other threads:[~2017-01-22 21:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-11 20:36 bug#25422: GIT_SSL_CAINFO set incorrectly Leo Famulari
2017-01-14 21:20 ` Ludovic Courtès
2017-01-22 21:51 ` bug#25422: [PATCH 0/2] Support single-entry search paths Ludovic Courtès
2017-01-22 21:52 ` Ludovic Courtès [this message]
2017-01-22 21:52 ` bug#25422: [PATCH 2/2] search-paths: Allow specs with #f as their separator Ludovic Courtès
2017-01-23 13:00 ` bug#25422: [PATCH 0/2] Support single-entry search paths Ricardo Wurmus
2017-01-23 22:02 ` Ludovic Courtès
2017-04-02 22:22 ` Ludovic Courtès
2017-01-20 4:27 ` bug#25422: GIT_SSL_CAINFO set incorrectly Mekeor Melire
2017-01-23 13:57 ` Ludovic Courtès
2017-02-10 16:22 ` Mekeor Melire
2017-02-10 20:51 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170122215201.7948-2-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=25422@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).