diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-11-19 21:27:56 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-11-19 21:27:56 +0000 |
| commit | 4751026b52d608786d68b0b914cd817872c13b60 (patch) | |
| tree | bd500f45a4cd827e9c94167483b11300e1d87d5c /eclass | |
| parent | arm stable, bug #429484 (diff) | |
| download | gentoo-2-4751026b52d608786d68b0b914cd817872c13b60.tar.gz gentoo-2-4751026b52d608786d68b0b914cd817872c13b60.tar.bz2 gentoo-2-4751026b52d608786d68b0b914cd817872c13b60.zip | |
Fix error case to be more descriptive. Move 'einfo' lower to avoid empty output.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/haskell-cabal.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
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 |