Changeset 10623 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Dec 11, 2006, 10:59:49 AM (20 years ago)

Author:

Paul Price

Message:

Getting rid of WORKDIR completely.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (5 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-08 23:47:04 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-11 20:59:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
     psFree(config->arguments);
     psFree(config->database);
-    psFree(config->workdir);
 }
 
@@ -62 +61 @@
     config->argv = argv;
     config->defaultRecipe = NULL;
-    config->workdir = NULL;
 
     // the file structure is used to carry pmFPAfiles
@@ -389 +387 @@
     }
 
-    // Get the working directory
-    config->workdir = psMemIncrRefCounter(psMetadataLookupStr(NULL, config->site, "WORKDIR"));
-    if (!config->workdir) {
-        psWarning("WORKDIR is not set in the site configuration\n");
-    } else {
-        config->workdir = resolveEnvVar(config->workdir);
-    }
-
     // define the config-file search path (configPath).  Ensure that
     // it contains the directory where we found the config file in
@@ -892 +882 @@
     // substitute neb://name with matched nebulous name
 
-    #if 0
-    // if we still have a relative path, prepend WORKDIR:
-    if (newName[0] != '/') {
-        char *workdir = psMetadataLookupStr (NULL, config->site, "WORKDIR");
-        if (workdir) {
-            psStringPrepend (&newName, "%s/", workdir);
-        }
-    }
-    #endif
-
     return newName;
 }