[gentoo-commits] gentoo-x86 commit in eclass: ghc-package.eclass

[Lennart Kolmodin (kolmodin)]

kolmodin    10/06/24 13:50:10

  Modified:             ghc-package.eclass
  Log:
  ghc-package.eclass: Fix for GHC 6.12.3 when having broken packages in your environment.

Revision  Changes    Path
1.28                 eclass/ghc-package.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?r1=1.27&r2=1.28

Index: ghc-package.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ghc-package.eclass	23 Mar 2009 20:06:19 -0000	1.27
+++ ghc-package.eclass	24 Jun 2010 13:50:10 -0000	1.28
@@ -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@g.o>
 # Maintained by: Haskell herd <haskell@g.o>
@@ -295,9 +295,13 @@
 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|/.*$||" \