[Erp5-report] r34744 luke - /erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

[nobody at svn.erp5.org]

Author: luke
Date: Fri Apr 23 13:10:29 2010
New Revision: 34744

URL: http://svn.erp5.org?rev=34744&view=rev
Log:
 - inform better about required options

Modified:
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py?rev=34744&r1=34743&r2=34744&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] Fri Apr 23 13:10:29 2010
@@ -79,9 +79,12 @@
       'template_directory',
       'pid_file'
     ]
-  for o in required_option_list:
-    if not getattr(options, o, None):
-      parser.error('All options are required, missing "%s".' % o)
+  missing_required_option_list = [o for o in required_option_list \
+      if not getattr(options, o, None)]
+  if len(missing_required_option_list):
+    parser.error('Required options are missing: %s' % ', '.join(
+      missing_required_option_list))
+
   for filepath in options.base_profile,:
     if not os.path.exists(filepath):
       raise ValueError('Cannot find "%s"' % os.path.abspath(filepath))