commit: e0cd473d0681da109da341a8422f99c3ba4e0487
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Jan 11 19:01:51 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 11 19:01:51 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e0cd473d
sys-cluster/htcondo: Add
Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
---
...ondor_config-last-rather-than-first-8.3.2.patch | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git
a/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
b/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
new file mode 100644
index 0000000..bedd7c5
--- /dev/null
+++
b/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
@@ -0,0 +1,25 @@
+--- src/condor_utils/condor_config.cpp 2014-12-23 18:18:42.000000000 +0100
++++ src/condor_utils/condor_config.cpp 2015-01-11 19:59:17.000000000 +0100
+@@ -1454,18 +1454,14 @@ find_file(const char *env_name, const ch
+ if (!config_source) {
+ // List of condor_config file locations we'll try to
open.
+ // As soon as we find one, we'll stop looking.
+- const int locations_length = 4;
++ const int locations_length = 3;
+ MyString locations[locations_length];
+- // 1) $HOME/.condor/condor_config
+- // $HOME/.condor/condor_config was added for BOSCO and never
used, We are removing it in 8.3.1, but may put it back if users complain.
+- //find_user_file(locations[0], file_name, false);
+- // 2) /etc/condor/condor_config
+- locations[1].formatstr( "/etc/%s/%s", myDistro->Get(),
file_name );
++ locations[0].formatstr( "/etc/%s/%s", myDistro->Get(),
file_name );
+ // 3) /usr/local/etc/condor_config (FreeBSD)
+- locations[2].formatstr( "/usr/local/etc/%s", file_name );
++ locations[1].formatstr( "/usr/local/etc/%s", file_name );
+ if (tilde) {
+ // 4) ~condor/condor_config
+- locations[3].formatstr( "%s/%s", tilde, file_name );
++ locations[2].formatstr( "%s/%s", tilde, file_name );
+ }
+
+ int ctr;
