# HG changeset patch # User Jeff Hammel # Date 1332883419 25200 # Node ID 18f8107aa4f9f66d105d84b5e6d345e760915732 # Parent 47c9cdf512562c99e7c3501e138958791639e6db tests fail again, what fun diff -r 47c9cdf51256 -r 18f8107aa4f9 configuration/config.py --- a/configuration/config.py Tue Mar 27 14:16:42 2012 -0700 +++ b/configuration/config.py Tue Mar 27 14:23:39 2012 -0700 @@ -356,8 +356,12 @@ parser.error(str(e)) config.append(cli_config) - # generate configuration - self(*config) + missingvalues = None + try: + # generate configuration + self(*config) + except MissingValueException, e: + pass # dump configuration, if specified dump = getattr(options, 'dump') @@ -365,6 +369,10 @@ # TODO: have a way of specifying format other than filename self.serialize(dump) + if missingvalues and not dump: + # XXX assuming if you don't have values you were just dumping + parser.error(str(e)) + # return parsed arguments return options, args