diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-11-21 09:06:42 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-11-21 09:06:42 +0000 |
| commit | 9bb2b35a219ff60eab195ffc4bb9922080d526e1 (patch) | |
| tree | b7fef5c6d16bc6028f538038340ce9056cda3ef5 /eclass | |
| parent | Introduce python_domodule() to install Python modules. (diff) | |
| download | gentoo-2-9bb2b35a219ff60eab195ffc4bb9922080d526e1.tar.gz gentoo-2-9bb2b35a219ff60eab195ffc4bb9922080d526e1.tar.bz2 gentoo-2-9bb2b35a219ff60eab195ffc4bb9922080d526e1.zip | |
systemd_do*: use local variable scope instead of subshelling.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/systemd.eclass | 30 |
2 files changed, 17 insertions, 18 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6171b5bf1fd6..4a889cae9757 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.515 2012/11/21 09:04:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.516 2012/11/21 09:06:42 mgorny Exp $ + + 21 Nov 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass: + systemd_do*: use local variable scope instead of subshelling. 21 Nov 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass: Introduce python_domodule() to install Python modules. diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 47e342b38902..63f6ed0cd424 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.18 2012/10/30 21:56:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.19 2012/11/21 09:06:42 mgorny Exp $ # @ECLASS: systemd.eclass # @MAINTAINER: @@ -69,10 +69,9 @@ systemd_get_utildir() { systemd_dounit() { debug-print-function ${FUNCNAME} "${@}" - ( - insinto "$(_systemd_get_unitdir)" - doins "${@}" - ) + local INSDESTTREE + insinto "$(_systemd_get_unitdir)" + doins "${@}" } # @FUNCTION: systemd_newunit @@ -83,10 +82,9 @@ systemd_dounit() { systemd_newunit() { debug-print-function ${FUNCNAME} "${@}" - ( - insinto "$(_systemd_get_unitdir)" - newins "${@}" - ) + local INSDESTTREE + insinto "$(_systemd_get_unitdir)" + newins "${@}" } # @FUNCTION: systemd_dotmpfilesd @@ -102,10 +100,9 @@ systemd_dotmpfilesd() { || die 'tmpfiles.d files need to have .conf suffix.' done - ( - insinto /usr/lib/tmpfiles.d/ - doins "${@}" - ) + local INSDESTTREE + insinto /usr/lib/tmpfiles.d/ + doins "${@}" } # @FUNCTION: systemd_newtmpfilesd @@ -119,10 +116,9 @@ systemd_newtmpfilesd() { [[ ${2} == *.conf ]] \ || die 'tmpfiles.d files need to have .conf suffix.' - ( - insinto /usr/lib/tmpfiles.d/ - newins "${@}" - ) + local INSDESTTREE + insinto /usr/lib/tmpfiles.d/ + newins "${@}" } # @FUNCTION: systemd_enable_service |