Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 24 Nov 2015 21:58:52
Message-Id: 1448402187.396e8ef67d5956f1e2fd11b6ea91589c8b8b133a.eva@gentoo
1 commit: 396e8ef67d5956f1e2fd11b6ea91589c8b8b133a
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 21 11:25:07 2015 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 24 21:56:27 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396e8ef6
7
8 gnome2-utils.eclass: make sure configure exists before try to sed it
9
10 Would cause error messages, see bug #566202.
11
12 Thanks to Gregory Turner for reporting.
13
14 https://bugs.gentoo.org/show_bug.cgi?id=566202
15
16 eclass/gnome2-utils.eclass | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
20 index f945a78..83a3610 100644
21 --- a/eclass/gnome2-utils.eclass
22 +++ b/eclass/gnome2-utils.eclass
23 @@ -486,7 +486,7 @@ gnome2_disable_deprecation_warning() {
24 fi
25 done < <(find "${S}" -name "Makefile.in" \
26 -o -name "Makefile.am" -o -name "Makefile.decl" \
27 - | sort; echo configure)
28 + | sort; [[ -f "${S}"/configure ]] && echo configure)
29 # TODO: sedding configure.ac can trigger maintainer mode; bug #439602
30 # -o -name "configure.ac" -o -name "configure.in" \
31 # | sort; echo configure)