Those 2 patches fix torque for oscar 6.0.5+
config.xml fixes a dep in the rpm
TORQUE.pm fix testing path
--
Olivier LAHAYE
CEAEA Saclay
DRT-LIST-DCSI-DIR
Index: config.xml
===================================================================
--- config.xml (révision 9202)
+++ config.xml (copie de travail)
@@ -32,7 +32,7 @@
<pkg>torque-oscar-gui</pkg>
<pkg>torque-oscar-mom</pkg>
<pkg>torque-oscar-client</pkg>
- <pkg>torque-modulefile</pkg>
+ <pkg>torque-oscar-modulefile</pkg>
<pkg>torque-oscar-scheduler</pkg>
</requires>
<requires>
@@ -52,12 +52,17 @@
<pkg>torque-oscar</pkg>
<pkg>torque-oscar-mom</pkg>
<pkg>torque-oscar-client</pkg>
- <pkg>torque-modulefile</pkg>
+ <pkg>torque-oscar-modulefile</pkg>
</requires>
</clientDeps>
<apiDeps/>
<changelog>
- <versionEntry version="2.1.13-1">
+ <versionEntry version="2.1.14-1">
+ <changelogEntry authorName="Olivier Lahaye" date="2010-04-21T17:27:33+02:00">
+ <item>Updated deps: torque-modulefile => torque-oscar-modulefile.</item>
+ </changelogEntry>
+ </versionEntry>
+ <versionEntry version="2.1.13-1">
<changelogEntry authorName="Geoffroy Vallee" date="2009-07-16T17:57:33-05:00">
<item>Fix the path to the torque tests + improve error messages.</item>
</changelogEntry>
Index: /root/oscar/packages/torque/scripts/TORQUE.pm
===================================================================
--- /root/oscar/packages/torque/scripts/TORQUE.pm (révision 9202)
+++ /root/oscar/packages/torque/scripts/TORQUE.pm (copie de travail)
@@ -35,7 +35,7 @@
major => $xml_ref->{version}->{major},
minor => $xml_ref->{version}->{minor},
subversion => $xml_ref->{version}->{subversion},
- test => "/var/lib/oscar/$pkg/testing/$test",
+ test => "/var/lib/oscar/testing/$pkg/$test",
jobscript => $jobscript,
};
------------------------------------------------------------------------------
_______________________________________________
Oscar-devel mailing list
Oscar-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oscar-devel
