diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2014-11-18 22:17:47 -0600 |
---|---|---|
committer | Austin Seipp <austin@well-typed.com> | 2014-11-19 17:03:05 -0600 |
commit | 6fc78fdfa1482a31ed7b586f20c9d7cb592ea944 (patch) | |
tree | faca1cc9e2eab107c6ca86606ed0e3e42d4bf005 /libraries/filepath | |
parent | 101c62e26286353dd3fac1ef54323529b64c9902 (diff) | |
download | haskell-6fc78fdfa1482a31ed7b586f20c9d7cb592ea944.tar.gz |
Refactor: use System.FilePath.splitSearchPath
Summary:
To address #2521 ("Trailing colon on GHC_PACKAGE_PATH doesn't work with
ghc-pkg"), we were using a custom version of splitSearchPath (e4f46f5de). This
solution however caused issue #9698 ("GHC_PACKAGE_PATH should be more lenient
for empty paths").
This patch reverts back to System.FilePath.splitSearchPath (fixes #9698) and
adresses (#2521) by testing for a trailing search path separators explicitly
(instead of implicitly using empty search path elements).
Empty paths are now allowed (ignored on Windows, interpreted as current
directory on Posix systems), and trailing path separator still tack on the
user and system package databases.
Also update submodule filepath, which has a version of splitSearchPath which
handles quotes in the same way as our custom version did.
Test Plan:
$ GHC_PACKAGE_PATH=/::/home: ./ghc-pkg list
...
db stack: ["/",".","/home","<userdb>","<systemdb>"]
...
Reviewers: austin
Reviewed By: austin
Subscribers: thomie, carter, simonmar
Differential Revision: https://phabricator.haskell.org/D414
GHC Trac Issues: #2521, #9698
Diffstat (limited to 'libraries/filepath')
m--------- | libraries/filepath | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/libraries/filepath b/libraries/filepath -Subproject 7011e20dbe30f96f34f6cfb1fd3f3aad9e7a653 +Subproject 83b6d8c555d278f5bb79cef6661d02bc38e72c1 |