diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2014-10-17 03:59:14 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2014-10-17 03:59:14 +0000 |
| commit | 02c401fa97f89111573ed8cb2919131ce2294980 (patch) | |
| tree | 956422852c4983779836cf31dbe1aac8758e9dce /sys-cluster | |
| parent | Remove old. (diff) | |
| download | gentoo-2-02c401fa97f89111573ed8cb2919131ce2294980.tar.gz gentoo-2-02c401fa97f89111573ed8cb2919131ce2294980.tar.bz2 gentoo-2-02c401fa97f89111573ed8cb2919131ce2294980.zip | |
Only preserve nodes if server is enabled, #489336. Thanks to Olaf Leidinger for the patch.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/torque/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-4.1.5.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-4.1.7.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-4.2.9-r1.ebuild | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index 551a12c7371e..c7fc2cb127b6 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/torque # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.172 2014/10/17 03:23:11 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.173 2014/10/17 03:59:14 jsbronder Exp $ + + 17 Oct 2014; Justin Bronder <jsbronder@gentoo.org> torque-4.1.5.1-r1.ebuild, + torque-4.1.7.ebuild, torque-4.2.9-r1.ebuild: + Only preserve nodes if server is enabled, #489336. Thanks to Olaf Leidinger + for the patch. *torque-4.2.9-r1 (17 Oct 2014) diff --git a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild index d931c037cf91..b76e696f5da7 100644 --- a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild +++ b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.10 2014/10/17 02:54:02 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.11 2014/10/17 03:59:14 jsbronder Exp $ EAPI=4 inherit flag-o-matic eutils linux-info @@ -142,7 +142,7 @@ pkg_preinst() { cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die fi - if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then cp "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" \ "${D}"/${PBS_SERVER_HOME}/server_priv/nodes || die fi diff --git a/sys-cluster/torque/torque-4.1.7.ebuild b/sys-cluster/torque/torque-4.1.7.ebuild index c37fde44eafc..e3bc3421dd74 100644 --- a/sys-cluster/torque/torque-4.1.7.ebuild +++ b/sys-cluster/torque/torque-4.1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.7.ebuild,v 1.3 2014/10/17 02:54:02 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.7.ebuild,v 1.4 2014/10/17 03:59:14 jsbronder Exp $ EAPI=5 @@ -145,7 +145,7 @@ pkg_preinst() { cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die fi - if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then cp \ "${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \ "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die diff --git a/sys-cluster/torque/torque-4.2.9-r1.ebuild b/sys-cluster/torque/torque-4.2.9-r1.ebuild index 15a08dfa2891..3f8ed13495b1 100644 --- a/sys-cluster/torque/torque-4.2.9-r1.ebuild +++ b/sys-cluster/torque/torque-4.2.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.2.9-r1.ebuild,v 1.1 2014/10/17 03:23:11 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.2.9-r1.ebuild,v 1.2 2014/10/17 03:59:14 jsbronder Exp $ EAPI=5 @@ -145,7 +145,7 @@ pkg_preinst() { cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die fi - if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then cp \ "${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \ "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die |