[gentoo-commits] gentoo-x86 commit in eclass: systemd.eclass

[Zac Medico (zmedico)]

zmedico     11/07/28 13:47:50

  Modified:             systemd.eclass
  Log:
  systemd_dounit: fix for prefix

Revision  Changes    Path
1.7                  eclass/systemd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.6&r2=1.7

Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- systemd.eclass	24 Jun 2011 13:13:24 -0000	1.6
+++ systemd.eclass	28 Jul 2011 13:47:50 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.6 2011/06/24 13:13:24 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.7 2011/07/28 13:47:50 zmedico Exp $
 
 # @ECLASS: systemd.eclass
 # @MAINTAINER:
@@ -47,10 +47,12 @@
 # Install systemd unit(s). Uses doins, thus it is fatal in EAPI 4
 # and non-fatal in earlier EAPIs.
 systemd_dounit() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
-		insinto "$(systemd_get_unitdir)"
+		local ud=$(systemd_get_unitdir)
+		insinto "${ud#${EPREFIX}}"
 		doins "${@}"
 	)
 }