# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1332882977 25200
# Node ID fb133bc3bed19b8d51ba4b5f88dde1cb29218dc3
# Parent  113e8c2f7cab85ed4e8d555473bcd9f005a51965
actually deserialize things

diff -r 113e8c2f7cab -r fb133bc3bed1 configuration/config.py
--- a/configuration/config.py	Tue Mar 27 14:01:25 2012 -0700
+++ b/configuration/config.py	Tue Mar 27 14:16:17 2012 -0700
@@ -317,7 +317,7 @@
         formats = self.formats()
         if formats and dump:
             parser.add_option(dump, dest='dump',
-                              help="dump configuration to a file [Formats: %s]" % formats)
+                              help="dump configuration to a file; Formats: %s" % formats)
 
         return parser
 
@@ -348,11 +348,16 @@
                    if not os.path.exists(i)]
         if missing:
             parser.error("Missing files: %s" % ', '.join(missing))
+        config = []
         for f in configuration_files:
-            pass
+            try:
+                config.append(self.deserialize(f))
+            except BaseException, e:
+                parser.error(str(e))
+        config.append(cli_config)
 
         # generate configuration
-        self(cli_config)
+        self(*config)
 
         # dump configuration, if specified
         dump = getattr(options, 'dump')