From ebcb2cfd1045049d260dda3c4f17fcdcf6162016 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 18 Aug 2006 09:31:55 +0000 Subject: [PATCH] bug fix, bail out not handled when changing a single var --- plc-config-tty | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/plc-config-tty b/plc-config-tty index 9bb8abe..ddf3fb1 100755 --- a/plc-config-tty +++ b/plc-config-tty @@ -6,6 +6,11 @@ # # -d is for the myplc-devel package +# we use 3 instances of PLCConfiguration throughout: +# cdef : models the defaults, from plc_default.xml +# cread : merged from plc_default & configs/site.xml +# cwrite : site.xml + pending changes + import sys import os import re @@ -15,8 +20,8 @@ import getopt from plc_config import PLCConfiguration #################### -release_id = "$Id: plc-config-tty,v 1.5 2006/08/08 16:59:23 thierry Exp $" -release_rev = "$Revision$" +release_id = "$Id: plc-config-tty,v 1.6 2006/08/17 16:17:18 thierry Exp $" +release_rev = "$Revision: 1.6 $" def init_flavour (flavour): global service @@ -376,8 +381,12 @@ def mainloop (cdef, cread, cwrite, default_config, site_config, consolidated_con elif mode == 'CATEGORY': prompt_variables_category(cdef,cread,cwrite,category_id,show_comments) elif mode == 'VARIABLE': - prompt_variable (cdef,cread,cwrite,category,variable, - show_comments,False) + try: + prompt_variable (cdef,cread,cwrite,category,variable, + show_comments,False) + except Exception, inst: + if (str(inst) != 'BailOut'): + raise elif (command in "vVsSlL"): show_value=(command in "sSlL") (c1,c2,c3) = (cdef, cread, cwrite) -- 2.47.0