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

Timestamp:

Mar 22, 2007, 8:07:18 AM (19 years ago)

Author:

magnier

Message:

changed config recipes rules: master recipe file must exist

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-20 01:30:45 $
+ *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-22 18:07:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -829 +829 @@
             }
         } // Done looking at all cameras
-        psFree(camerasIter);
+        psFree(camerasIter);
 
         if (! config->camera) {
@@ -837 +837 @@
 
         // Now we have the camera, we can read the recipes
-        pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CAMERA | PM_RECIPE_SOURCE_CL);
+        if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CAMERA | PM_RECIPE_SOURCE_CL)) {
+            psError(PS_ERR_IO, false, "Error reading recipes from camera config for %s", config->cameraName);
+            return NULL;
+        }
         return psMemIncrRefCounter(format);
     }