From cef38cd33fa0db8ca216ab5194388084d12aee47 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 24 May 2012 16:04:45 +0400 Subject: [PATCH] Fix Ctrl+C behevior on question --- pym/cl_builder.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pym/cl_builder.py b/pym/cl_builder.py index 793e8fd..dd1c672 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -550,7 +550,12 @@ class cl_builder(color_print): if not force: dialogMessage = _("Continue creating the system image") \ + " (yes/no)" - dialogRes = dialogYesNo(dialogMessage) + try: + dialogRes = dialogYesNo(dialogMessage) + except KeyboardInterrupt: + self.assembleIso = False + self.printERROR(_("Image creating interrupted")) + return False if dialogRes in (None,False): self.assembleIso = False self.printERROR(_("Image creating interrupted")) @@ -625,7 +630,10 @@ class cl_builder(color_print): if not force: dialogMessage = _("Continue rebuilding the flash live system") \ + " (yes/no)" - dialogRes = dialogYesNo(dialogMessage) + try: + dialogRes = dialogYesNo(dialogMessage) + except KeyboardInterrupt: + return True if dialogRes in (None,False): return True