[Checkins] SVN: keas.build/trunk/ handle keyboard interrupts.

[Paul Carduner]

Log message for revision 104709:
  handle keyboard interrupts.

Changed:
  U   keas.build/trunk/CHANGES.txt
  U   keas.build/trunk/src/keas/build/build.py
  U   keas.build/trunk/src/keas/build/install.py
  U   keas.build/trunk/src/keas/build/package.py

-=-
Modified: keas.build/trunk/CHANGES.txt
===================================================================
--- keas.build/trunk/CHANGES.txt	2009-10-01 19:42:49 UTC (rev 104708)
+++ keas.build/trunk/CHANGES.txt	2009-10-01 19:58:24 UTC (rev 104709)
@@ -18,6 +18,9 @@
   a helpful error message is printed and no files will be uploaded
   until all have been created successfully.
 
+- Bug Fix: Typing Ctrl+c on the command line no longer causes a
+  KeyboardInterrupt traceback to be spit out.
+
 0.1.3 (2009-09-30)
 ------------------
 

Modified: keas.build/trunk/src/keas/build/build.py
===================================================================
--- keas.build/trunk/src/keas/build/build.py	2009-10-01 19:42:49 UTC (rev 104708)
+++ keas.build/trunk/src/keas/build/build.py	2009-10-01 19:58:24 UTC (rev 104709)
@@ -181,7 +181,11 @@
     if options.quiet:
         logger.setLevel(logging.FATAL)
 
-    build(options.configFile, options)
+    try:
+        build(options.configFile, options)
+    except KeyboardInterrupt:
+        logger.info("Quitting")
+        sys.exit(0)
 
     # Remove the handler again.
     logger.removeHandler(handler)

Modified: keas.build/trunk/src/keas/build/install.py
===================================================================
--- keas.build/trunk/src/keas/build/install.py	2009-10-01 19:42:49 UTC (rev 104708)
+++ keas.build/trunk/src/keas/build/install.py	2009-10-01 19:58:24 UTC (rev 104709)
@@ -138,7 +138,7 @@
         # 4. Install the package
         base.do('%s -t 2 -%sc %s%s/%s-%s-%s.cfg' %(
             self.options.buildout,
-            "vvvvv" if self.options.verbose else "",
+            "vv" if self.options.verbose else "",
             self.options.url,
             project,
             project, variant, version))
@@ -216,8 +216,13 @@
         logger.setLevel(logging.FATAL)
 
     installer = Installer(options)
-    installer.runCLI()
 
+    try:
+        installer.runCLI()
+    except KeyboardInterrupt:
+        logger.info("Quitting")
+        sys.exit(0)
+
     # Remove the handler again.
     logger.removeHandler(handler)
 

Modified: keas.build/trunk/src/keas/build/package.py
===================================================================
--- keas.build/trunk/src/keas/build/package.py	2009-10-01 19:42:49 UTC (rev 104708)
+++ keas.build/trunk/src/keas/build/package.py	2009-10-01 19:58:24 UTC (rev 104709)
@@ -398,7 +398,11 @@
         sys.exit(0)
     for pkg in args:
         builder = PackageBuilder(pkg, options)
-        builder.runCLI(options.configFile)
+        try:
+            builder.runCLI(options.configFile)
+        except KeyboardInterrupt:
+            logger.info("Quitting")
+            sys.exit(0)
 
     # Remove the handler again.
     logger.removeHandler(handler)