Don't expect variable expansion in env.d. Thanks to jer for reporting this (Bug #201260).

Package-Manager: portage-2.1.3.19

4 files changed, 24 insertions, 20 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index e08a9a2707db..9a523f364554 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.53 2007/11/29 01:01:35 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.54 2007/12/04 21:38:12 jsbronder Exp $
+
+  04 Dec 2007; <jsbronder@gentoo.org> files/torque-env.d-2.2.1-r1,
+  torque-2.2.1-r1.ebuild:
+  Don't expect variable expansion in env.d.  Thanks to jer for reporting this
+  (Bug #201260).
 
 *torque-2.2.1-r1 (29 Nov 2007)
 
-  29 Nov 2007; <jbronder@gentoo.org> +files/pbs_mom-init.d-2.2.1-r1,
+  29 Nov 2007; <jsbronder@gentoo.org> +files/pbs_mom-init.d-2.2.1-r1,
   +files/pbs_sched-init.d-2.2.1-r1, +files/pbs_server-init.d-2.2.1-r1,
   +files/torque-conf.d-2.2.1-r1, +files/torque-env.d-2.2.1-r1,
   +torque-2.2.1-r1.ebuild:
@@ -12,7 +17,7 @@
 
 *torque-2.2.1 (24 Nov 2007)
 
-  24 Nov 2007; <jbronder@gentoo.org> +files/pbs_mom-init.d-2.2.1,
+  24 Nov 2007; <jsbronder@gentoo.org> +files/pbs_mom-init.d-2.2.1,
   +files/pbs_sched-init.d-2.2.1, +files/pbs_server-init.d-2.2.1,
   +files/torque-conf.d-2.2.1, +files/torque-env.d-2.2.1,
   +files/torque-setuid-safety-am.patch, +torque-2.2.1.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index c07ed8259de9..9c9349b636c6 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -34,10 +34,10 @@ AUX torque-env.d-2.2.1 337 RMD160 bb5341d647e6c4545077783dd2aa4135662276f8 SHA1
 MD5 88709ff161b21152c142ac7bb30ce104 files/torque-env.d-2.2.1 337
 RMD160 bb5341d647e6c4545077783dd2aa4135662276f8 files/torque-env.d-2.2.1 337
 SHA256 0c5abf36209d684e7c4f82749f6c06ad976f7c1f3f0e94731b42c1d1331c5bed files/torque-env.d-2.2.1 337
-AUX torque-env.d-2.2.1-r1 375 RMD160 1d0e8ddb1bc6e68e59770268cd27d86c9937cb41 SHA1 fd99533aded0d3d2d283d55ab5a16c0544bb732a SHA256 f27e3dccf4ab049d2c6542b338c0cb29104b4372114301709d30fc18532a32f7
-MD5 b3683a60894bba4b753f0499ebd66f0e files/torque-env.d-2.2.1-r1 375
-RMD160 1d0e8ddb1bc6e68e59770268cd27d86c9937cb41 files/torque-env.d-2.2.1-r1 375
-SHA256 f27e3dccf4ab049d2c6542b338c0cb29104b4372114301709d30fc18532a32f7 files/torque-env.d-2.2.1-r1 375
+AUX torque-env.d-2.2.1-r1 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40b92ec2573aae1536aa35995ca3d7deb222 SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a
+MD5 a6a41f07b49f8dc3f56400b1a794de39 files/torque-env.d-2.2.1-r1 260
+RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 files/torque-env.d-2.2.1-r1 260
+SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a files/torque-env.d-2.2.1-r1 260
 AUX torque-setuid-safety-am.patch 546 RMD160 726578c77ebbc6a83ed8a258c31452c296109e6d SHA1 bd4ce2de39e3288c3fdd5bfad64f54e33c63ccdc SHA256 81c59eaa06eab86e684d21e7ec9d15b331473194ee1e367450816f6e0fd09bfb
 MD5 a526f0c918145bf2c2570a2728a54d0f files/torque-setuid-safety-am.patch 546
 RMD160 726578c77ebbc6a83ed8a258c31452c296109e6d files/torque-setuid-safety-am.patch 546
@@ -52,18 +52,18 @@ EBUILD torque-2.1.6.ebuild 4011 RMD160 6c7adb692028e9e75f2980974f5a9f9e35930d95
 MD5 64ebd8ba4e9016d73054a98a2f258942 torque-2.1.6.ebuild 4011
 RMD160 6c7adb692028e9e75f2980974f5a9f9e35930d95 torque-2.1.6.ebuild 4011
 SHA256 e8d1c44427d396b35805240a6707013bed3010155189f6b8d6ce1eb914f573b2 torque-2.1.6.ebuild 4011
-EBUILD torque-2.2.1-r1.ebuild 7216 RMD160 d200b93c79beb587a9d6b45932b63bf6a08dc7e5 SHA1 4a5f8acd1b8ecb015f9e5c04c8232e390361883d SHA256 b46216a439b7cfb7df748e8dd8ed830ae83fd37d003c07f5074e1b0645923611
-MD5 7d257332f8fbedc531e5f4e0eff12cf7 torque-2.2.1-r1.ebuild 7216
-RMD160 d200b93c79beb587a9d6b45932b63bf6a08dc7e5 torque-2.2.1-r1.ebuild 7216
-SHA256 b46216a439b7cfb7df748e8dd8ed830ae83fd37d003c07f5074e1b0645923611 torque-2.2.1-r1.ebuild 7216
+EBUILD torque-2.2.1-r1.ebuild 7190 RMD160 ef54652f2f777bd87ca97f5379f2222b8678deda SHA1 ac6e92d509b96dc6158bb36b0548c51d52c1cd27 SHA256 af1c99c4ddbfa9e19f167775e770d04ae9945201dce202a616f94b45b180a804
+MD5 6de3b279957cf4345ddc71d67576ed4c torque-2.2.1-r1.ebuild 7190
+RMD160 ef54652f2f777bd87ca97f5379f2222b8678deda torque-2.2.1-r1.ebuild 7190
+SHA256 af1c99c4ddbfa9e19f167775e770d04ae9945201dce202a616f94b45b180a804 torque-2.2.1-r1.ebuild 7190
 EBUILD torque-2.2.1.ebuild 4810 RMD160 f5d6b7dc83342b9f4ad29bff92dcea5600b93faf SHA1 154bf1d910c71fedc07c8842b7c67b882d87c6c9 SHA256 a8c2d003798ed5670475336dbfc3602f63aaee731eb0814a1ac9f0a793fc4eb8
 MD5 678639185655d58f46763c6372da93dc torque-2.2.1.ebuild 4810
 RMD160 f5d6b7dc83342b9f4ad29bff92dcea5600b93faf torque-2.2.1.ebuild 4810
 SHA256 a8c2d003798ed5670475336dbfc3602f63aaee731eb0814a1ac9f0a793fc4eb8 torque-2.2.1.ebuild 4810
-MISC ChangeLog 9922 RMD160 91a54c04c158024fa20e972ec84461117ffd3362 SHA1 f757a98fe0fcfa776fa1422c3555381b3d940f04 SHA256 c654027ba31389f62615ff56ba57c1ddffeaa8c6e32d68ae05f7198245f35393
-MD5 2728e08c2869c481a833e7bf9a1ef0d3 ChangeLog 9922
-RMD160 91a54c04c158024fa20e972ec84461117ffd3362 ChangeLog 9922
-SHA256 c654027ba31389f62615ff56ba57c1ddffeaa8c6e32d68ae05f7198245f35393 ChangeLog 9922
+MISC ChangeLog 10113 RMD160 c8a468ef04c0c3b2b5d627728027d429070bcefb SHA1 7bc10e274fedd93856953eb4e396232e3ae0fff3 SHA256 2f49104823ea27ff0f45bbb9b3b28c36501116809facd086ac48f1020dfa0b14
+MD5 47b9d0aed392173684fc402a327d3e74 ChangeLog 10113
+RMD160 c8a468ef04c0c3b2b5d627728027d429070bcefb ChangeLog 10113
+SHA256 2f49104823ea27ff0f45bbb9b3b28c36501116809facd086ac48f1020dfa0b14 ChangeLog 10113
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
diff --git a/sys-cluster/torque/files/torque-env.d-2.2.1-r1 b/sys-cluster/torque/files/torque-env.d-2.2.1-r1
index 13f5bb3995b5..f3efd90e53fc 100644
--- a/sys-cluster/torque/files/torque-env.d-2.2.1-r1
+++ b/sys-cluster/torque/files/torque-env.d-2.2.1-r1
@@ -3,5 +3,5 @@
 
 # Configuration files that are included in the initial Torque install
 PBS_SERVER_HOME="/var/spool/torque"
-CONFIG_PROTECT="${PBS_SERVER_HOME}/sched_priv/{holidays,resource_group,dedicated_time,sched_config} ${PBS_SERVER_HOME}/{server_name,pbs_environment}"
+CONFIG_PROTECT="/var/spool/torque"
 
diff --git a/sys-cluster/torque/torque-2.2.1-r1.ebuild b/sys-cluster/torque/torque-2.2.1-r1.ebuild
index b7e18d25a300..f03619f6a13f 100644
--- a/sys-cluster/torque/torque-2.2.1-r1.ebuild
+++ b/sys-cluster/torque/torque-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r1.ebuild,v 1.2 2007/11/29 07:30:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r1.ebuild,v 1.3 2007/12/04 21:38:12 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -149,9 +149,8 @@ pkg_preinst() {
 		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
 	fi
 
-	# Fix up the conf.d file to use our set server home.
-	sed -i "s:^PBS_SERVER_HOME=.*:PBS_SERVER_HOME=\"${PBS_SERVER_HOME}\":" \
-		"${D}/etc/env.d/25torque"
+	# Fix up the env.d file to use our set server home.
+	sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque
 }
 
 pkg_postinst() {