# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1335911369 25200
# Node ID 9dd0ebcdbc62c9334568075dd685ba1990ce4fcb
# Parent  982a775bf3d292d6d1b2579438d5a5521c4fd384
be more forgiving of blank configuration

diff -r 982a775bf3d2 -r 9dd0ebcdbc62 configuration/configuration.py
--- a/configuration/configuration.py	Tue May 01 10:46:26 2012 -0700
+++ b/configuration/configuration.py	Tue May 01 15:29:29 2012 -0700
@@ -430,7 +430,9 @@
         config = []
         for f in configuration_files:
             try:
-                config.append(self.deserialize(f))
+                loaded_config = self.deserialize(f)
+                if loaded_config:
+                    config.append(loaded_config)
             except BaseException, e:
                 parser.error(str(e))
         config.append(cli_config)