diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-11 07:58:00 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-11 07:58:00 +0000 |
| commit | 9d1dc5b57e9dd61a78816e6b46726c8329b29528 (patch) | |
| tree | 3a21229766baa78c1a6037d6102987c32320b29b /eclass | |
| parent | Remove old. (diff) | |
| download | historical-9d1dc5b57e9dd61a78816e6b46726c8329b29528.tar.gz historical-9d1dc5b57e9dd61a78816e6b46726c8329b29528.tar.bz2 historical-9d1dc5b57e9dd61a78816e6b46726c8329b29528.zip | |
Use subshells instead of "local INSDESTTREE" for doins/newins since that confuses people less.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/systemd.eclass | 30 |
2 files changed, 22 insertions, 14 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 65c9dc511dd0..de5d26f5a2ff 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.955 2013/09/10 09:10:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.956 2013/09/11 07:58:00 mgorny Exp $ + + 11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass: + Use subshells instead of "local INSDESTTREE" for doins/newins since that + confuses people less. 10 Sep 2013; Michał Górny <mgorny@gentoo.org> multibuild.eclass: Add new enough coreutils dep wrt bug #484454. diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 45666316d4c6..a6c4f8184405 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.26 2013/07/27 10:36:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.27 2013/09/11 07:58:00 mgorny Exp $ # @ECLASS: systemd.eclass # @MAINTAINER: @@ -113,9 +113,10 @@ systemd_get_utildir() { systemd_dounit() { debug-print-function ${FUNCNAME} "${@}" - local INSDESTTREE - insinto "$(_systemd_get_unitdir)" - doins "${@}" + ( + insinto "$(_systemd_get_unitdir)" + doins "${@}" + ) } # @FUNCTION: systemd_newunit @@ -126,9 +127,10 @@ systemd_dounit() { systemd_newunit() { debug-print-function ${FUNCNAME} "${@}" - local INSDESTTREE - insinto "$(_systemd_get_unitdir)" - newins "${@}" + ( + insinto "$(_systemd_get_unitdir)" + newins "${@}" + ) } # @FUNCTION: systemd_dotmpfilesd @@ -144,9 +146,10 @@ systemd_dotmpfilesd() { || die 'tmpfiles.d files need to have .conf suffix.' done - local INSDESTTREE - insinto /usr/lib/tmpfiles.d/ - doins "${@}" + ( + insinto /usr/lib/tmpfiles.d/ + doins "${@}" + ) } # @FUNCTION: systemd_newtmpfilesd @@ -160,9 +163,10 @@ systemd_newtmpfilesd() { [[ ${2} == *.conf ]] \ || die 'tmpfiles.d files need to have .conf suffix.' - local INSDESTTREE - insinto /usr/lib/tmpfiles.d/ - newins "${@}" + ( + insinto /usr/lib/tmpfiles.d/ + newins "${@}" + ) } # @FUNCTION: systemd_enable_service |