diff options
| author |   Lennart Kolmodin <kolmodin@gentoo.org> | 2010-06-24 13:50:10 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-06-24 13:50:10 +0000 |
| commit | 91ac25862ef5aee5844cda7319b5625c435612dd (patch) | |
| tree | a49f06b5e0d9f9babfc6d5d33aaad358e98ea26b /eclass/ghc-package.eclass | |
| parent | Added fix for insecure runpaths, #291595, some QA (diff) | |
| download | gentoo-2-91ac25862ef5aee5844cda7319b5625c435612dd.tar.gz gentoo-2-91ac25862ef5aee5844cda7319b5625c435612dd.tar.bz2 gentoo-2-91ac25862ef5aee5844cda7319b5625c435612dd.zip | |
ghc-package.eclass: Fix for GHC 6.12.3 when having broken packages in your environment.
Diffstat (limited to 'eclass/ghc-package.eclass')
| -rw-r--r-- | eclass/ghc-package.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 03f85e3754ad..cc84637c8c6f 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.27 2009/03/23 20:06:19 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.28 2010/06/24 13:50:10 kolmodin Exp $ # # Author: Andres Loeh <kosmikus@gentoo.org> # Maintained by: Haskell herd <haskell@gentoo.org> @@ -295,9 +295,13 @@ ghc-elem() { ghc-listpkg() { local ghcpkgcall local i + local extra_flags + if version_is_at_least '6.12.3' "$(ghc-version)"; then + extra_flags="${extra_flags} -v0" + fi for i in $*; do if ghc-cabal; then - echo $($(ghc-getghcpkg) list -f "${i}") \ + echo $($(ghc-getghcpkg) list ${extra_flags} -f "${i}") \ | sed \ -e "s|^.*${i}:\([^:]*\).*$|\1|" \ -e "s|/.*$||" \ |