Merge lp:~linuxjedi/drizzle/trunk-bug-667360 into lp:drizzle/7.0

[Andrew Hutchings]

1. Make sure defaults-file is processed before options files
2. Processes plugin options again once defaults-files have been processed to make sure things like plugin-add in defaults files works (I don't like the way I had to do this bit, Monty: can you think of a better way?)
3. If --defaults-file doesn't exist on disk, error.

[Monty Taylor (mordred)]

This looks great!

review: Approve

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-10-26 19:14:30 +0000
+++ drizzled/drizzled.cc	2010-10-27 17:32:50 +0000
@@ -1140,7 +1140,16 @@
        it != in_options.end();
        ++it)
   {
-    defaults_file_list.push_back(*it);
+    fs::path p(*it);
+    if (fs::is_regular_file(p))
+      defaults_file_list.push_back(*it);
+    else
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR,
+                  _("Defaults file '%s' not found\n"), (*it).c_str());
+      unireg_abort(1);
+    }
+
   }
 }
 
@@ -1422,7 +1431,6 @@
     }
   }
 
-  process_defaults_files();
   /* TODO: here is where we should add a process_env_vars */
 
   /* We need a notify here so that plugin_init will work properly */
@@ -1438,6 +1446,25 @@
                   internal::my_progname, err.what());
     unireg_abort(1);
   }
+
+  process_defaults_files();
+
+  /* Process with notify a second time because a config file may contain
+     plugin loader options */
+
+  try
+  {
+    po::notify(vm);
+  }
+  catch (po::validation_error &err)
+  {
+    errmsg_printf(ERRMSG_LVL_ERROR,
+                  _("%s: %s.\n"
+                    "Use --help to get a list of available options\n"),
+                  internal::my_progname, err.what());
+    unireg_abort(1);
+  }
+
   /* At this point, we've read all the options we need to read from files and
      collected most of them into unknown options - now let's load everything
   */