Remove code that reads batch_gahp.config. HTCONDOR-521

This is the filename in older HTCondor releases, and was only checked in one of three places where the config file is read.
JaimeFrey · Jul 26, 2021 · 2f024bd · 2f024bd
1 parent 4cfbc7b
commit 2f024bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/config/glite-ce-blahparser b/config/glite-ce-blahparser
@@ -34,19 +34,15 @@ if [ ! -d "$BLAHPD_LOCATION" ]; then
 fi
 
 if [ ! -r "$BLAHPD_CONFIG_LOCATION" ]; then
-  if [ -r "/etc/batch_gahp.config" ]; then
-    export BLAHPD_CONFIG_LOCATION="/etc/batch_gahp.config"
-  elif [ -r "${BLAHPD_LOCATION:-/opt/glite}/etc/batch_gahp.config" ]; then
-    export BLAHPD_CONFIG_LOCATION="${BLAHPD_LOCATION:-/opt/glite}/etc/batch_gahp.config"
-  elif [ -r "/etc/blah.config" ]; then
+  if [ -r "/etc/blah.config" ]; then
     export BLAHPD_CONFIG_LOCATION="/etc/blah.config"
   elif [ -r "${BLAHPD_LOCATION:-/opt/glite}/etc/blah.config" ]; then
     export BLAHPD_CONFIG_LOCATION="${BLAHPD_LOCATION:-/opt/glite}/etc/blah.config"
   fi
 fi
 
 if [ ! -r "$BLAHPD_CONFIG_LOCATION" ]; then
-  echo "$0: Cannot read BLAH config file (\$BLAHPD_CONFIG_LOCATION, or /etc/batch_gahp.config, or /opt/glite/etc/batch_gahp.config, or /etc/blah.config, or /opt/glite/etc/blah.config)"
+  echo "$0: Cannot read BLAH config file (\$BLAHPD_CONFIG_LOCATION, or /etc/blah.config, or /opt/glite/etc/blah.config)"
   exit 1
 fi
 

diff --git a/src/scripts/blah_load_config.sh b/src/scripts/blah_load_config.sh
@@ -50,11 +50,6 @@ fi
 
 if [ -r "$BLAHPD_CONFIG_LOCATION" ]; then
   . $BLAHPD_CONFIG_LOCATION
-elif [ -r "${GLITE_LOCATION:-/opt/glite}/etc/batch_gahp.config" ]; then
-  . ${GLITE_LOCATION:-/opt/glite}/etc/batch_gahp.config
-elif [ -r "${BLAHPD_LOCATION}/etc/batch_gahp.config" ]; then
-#   This will default to /etc/batch_gahp.config if BLAHPD_LOCATION is unset.
-  . ${BLAHPD_LOCATION}/etc/batch_gahp.config
 elif [ -r "${GLITE_LOCATION:-/opt/glite}/etc/blah.config" ]; then
   . ${GLITE_LOCATION:-/opt/glite}/etc/blah.config
 elif [ -r "${BLAHPD_LOCATION}/etc/blah.config" ]; then