From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-749823-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 88695138A1A
for <garchives@archives.gentoo.org>; Sun, 23 Nov 2014 19:59:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 02934E0AC1;
Sun, 23 Nov 2014 19:59:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B188FE0AC1
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Nov 2014 19:59:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 844263403EC
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Nov 2014 19:59:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 30522AC2A
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Nov 2014 19:59:01 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" <grknight@gentoo.org>
Message-ID: <1416772734.b00900f5bf615c2040d714905e766bcd14e98985.grknight@gentoo>
Subject: [gentoo-commits] proj/mysql:master commit in: eclass/
X-VCS-Repository: proj/mysql
X-VCS-Files: eclass/mysql-cmake.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: b00900f5bf615c2040d714905e766bcd14e98985
X-VCS-Branch: master
Date: Sun, 23 Nov 2014 19:59:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7cdba87a-6de1-4be9-86f1-8bbc93dd3041
X-Archives-Hash: de4327a65506c1b86443670cc47e5d7a
commit: b00900f5bf615c2040d714905e766bcd14e98985
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 19:58:54 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 19:58:54 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b00900f5
Fix error in eclass from previous commit
---
eclass/mysql-cmake.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 32caf80..59f1b4b 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -297,7 +297,9 @@ mysql-cmake_src_prepare() {
# Remove the bundled groonga if it exists
# There is no CMake flag, it simply checks for existance
- [[ -d "${S}"/storage/mroonga/vendor/groonga ]] && rm -r "${S}"/storage/mroonga/vendor/groonga || die
+ if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+ fi
epatch_user
}