From b6c84e336737dbd28e2cc36a9b513cae940ec4d9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon, 19 Nov 2012 21:27:56 +0000
Subject: Fix error case to be more descriptive. Move 'einfo' lower to avoid
 empty output.

---
 eclass/haskell-cabal.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'eclass/haskell-cabal.eclass')

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 861936fa42c5..064e4b593589 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.36 2012/11/19 20:35:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.37 2012/11/19 21:27:56 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -580,11 +580,12 @@ cabal_chdeps() {
 	while :; do
 		from_pat=$1
 		to_str=$2
-		einfo "CHDEP: '${from_pat}' -> '${to_str}'"
 
 		[[ -n ${from_pat} ]] || break
 		[[ -n ${to_str} ]] || die "'${from_str}' does not have 'to' part"
 
+		einfo "CHDEP: '${from_pat}' -> '${to_str}'"
+
 		# escape pattern-like symbols
 		from_pat=${from_pat//\*/\\*}
 		from_pat=${from_pat//\[/\\[}
@@ -597,7 +598,7 @@ cabal_chdeps() {
 			diff -u "${T}/${cf}".{pre,post}
 		fi
 
-		[[ "${orig_c}" == "${new_c}" ]] && die "no trigger for '${from_ss}'"
+		[[ "${orig_c}" == "${new_c}" ]] && die "no trigger for '${from_pat}'"
 		orig_c=${new_c}
 		shift
 		shift
-- 
cgit v1.2.3-65-gdbad