verify phase fixed and re-enabled

[myplc.git] / plc-config-tty

diff --git a/plc-config-tty b/plc-config-tty
index d9559dc..1e45cdc 100755 (executable)
--- a/plc-config-tty
+++ b/plc-config-tty
@@ -18,10 +18,11 @@ import readline
 import getopt
 
 from plc_config import PLCConfiguration
+from plc_config import ConfigurationException
 
 ####################
-release_id = "$Id: plc-config-tty 635 2007-07-05 11:08:14Z thierry $"
-release_rev = "$Revision: 635 $"
+release_id = "$Id$"
+release_rev = "$Revision$"
 
 def init_flavour (flavour):
     global service
@@ -360,8 +361,14 @@ def mainloop (cdef, cread, cwrite, default_config, site_config, consolidated_con
             return
         elif (command in "wW"):
             try:
+                # Confirm that various constraints are met before saving file.
+                cwrite.verify(cdef, cread)
                 cwrite.save(site_config)
+            except ConfigurationException, e:
+                print "Save failed due to a configuration exception: %s" % e
+                break;
             except:
+                import traceback; print traceback.print_exc()
                 print ("Could not save -- fix write access on %s" % site_config)
                 break
             print ("Wrote %s" % site_config)