Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfig.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/config/pmConfig.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfig.c

@@ -806 +806 @@
     pmConfigLoadRecipeOptions(argc, argv, config, "-Df");
     pmConfigLoadRecipeOptions(argc, argv, config, "-Db");
+
+    if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CL)) {
+        psError(PS_ERR_IO, false, "Failed to read recipes from command-line");
+        psFree(config);
+        return NULL;
+    }
 
     // Look for command-line options for files to replace