From: Torsten Veller <tove@gentoo.org>
Date: Tue, 4 May 2010 08:03:40 +0000 (+0000)
Subject: Fix db_src_install_usrbinslot to proper SLOT again (#318367) and add a die
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ace5e5f94e93d5be44a988b2519f1b1f8f103ecd;p=gentoo.git

Fix db_src_install_usrbinslot to proper SLOT again (#318367) and add a die
---

diff --git a/eclass/db.eclass b/eclass/db.eclass
index 8dd54cbcdeb2..f74e39cb1c52 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -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/db.eclass,v 1.35 2010/05/04 02:06:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.36 2010/05/04 08:03:40 tove Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -92,7 +92,8 @@ db_src_install_usrbinslot() {
 	# slot all program names to avoid overwriting
 	for fname in "${D}"/usr/bin/db_*
 	do
-		mv "${fname}" "${fname//\/db_/\/db${SLOT}_}"
+		mv "${fname}" "${fname//\/db_//db${SLOT}_}" || \
+			die "Failed to rename ${fname}"
 	done
 }