Mercurial > hg > configuration

changeset 104:9dd0ebcdbc62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
be more forgiving of blank configuration
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 01 May 2012 15:29:29 -0700
parents 982a775bf3d2
children e00ff9b245f6
files configuration/configuration.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)