[gentoo-commits] eselect r732 - in trunk: . libs

[gentoo-commits] eselect r732 - in trunk: . libs

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-11-15 21:58:57 +0000 (Sun, 15 Nov 2009)
New Revision: 732

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/libs/skel.bash.in
Log:
Use EPREFIX in skel library when called from ebuild, bug 293317.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-15 21:57:24 UTC (rev 731)
+++ trunk/ChangeLog	2009-11-15 21:58:57 UTC (rev 732)
@@ -1,3 +1,9 @@
+2009-11-15  Ulrich Mueller  <ulm@gentoo.org>
+
+	* libs/skel.bash.in (do_add): Respect EPREFIX also when called
+	from within an ebuild environment. Patch from Fabian Groffen
+	<grobian@gentoo.org> in bug 293317.
+
 2009-11-13  Ulrich Mueller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.2.7.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-11-15 21:57:24 UTC (rev 731)
+++ trunk/NEWS	2009-11-15 21:58:57 UTC (rev 732)
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+trunk:
+    Bug fixes:
+    - Fixed bug #293317: Use EPREFIX in skel library when called from ebuild.
+
 1.2.7:
     Bug fixes:
     - Fixed bug #289095: Proper ROOT handling in multilib library.

Modified: trunk/libs/skel.bash.in
===================================================================
--- trunk/libs/skel.bash.in	2009-11-15 21:57:24 UTC (rev 731)
+++ trunk/libs/skel.bash.in	2009-11-15 21:58:57 UTC (rev 732)
@@ -293,7 +293,7 @@
 
 	# If $D is set, we're adding from portage so we want to respect sandbox.
 	# Otherwise, respect the ROOT variable.
-	local prefix=${D:-${EROOT}}
+	local prefix=${D:-${ROOT}}${EPREFIX}
 
 	# Create directory if necessary
 	if [[ ! -e ${prefix}/etc/env.d/${IFACE}/${1} ]]; then