[Checkins] SVN: keas.build/trunk/ allow not capturing subprocess output and make the install script not capture output when running the buildout command.

Paul Carduner paulcarduner at gmail.com
Fri Oct 2 01:25:06 EDT 2009


Log message for revision 104725:
  allow not capturing subprocess output and make the install script not capture output when running the buildout command.

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

-=-
Modified: keas.build/trunk/CHANGES.txt
===================================================================
--- keas.build/trunk/CHANGES.txt	2009-10-02 05:01:33 UTC (rev 104724)
+++ keas.build/trunk/CHANGES.txt	2009-10-02 05:25:06 UTC (rev 104725)
@@ -21,6 +21,9 @@
 - Bug Fix: Typing Ctrl+c on the command line no longer causes a
   KeyboardInterrupt traceback to be spit out.
 
+- Bug Fix: when running the installer, if the buildout command prompts
+  the user for input, the installer will no longer eat up the prompt.
+
 0.1.3 (2009-09-30)
 ------------------
 

Modified: keas.build/trunk/src/keas/build/base.py
===================================================================
--- keas.build/trunk/src/keas/build/base.py	2009-10-02 05:01:33 UTC (rev 104724)
+++ keas.build/trunk/src/keas/build/base.py	2009-10-02 05:25:06 UTC (rev 104725)
@@ -33,10 +33,14 @@
 
 BUILD_SECTION = 'build'
 
-def do(cmd, cwd = None):
+def do(cmd, cwd=None, captureOutput=True):
     logger.debug('Command: ' + cmd)
+    if captureOutput:
+        stdout = stderr = subprocess.PIPE
+    else:
+        stdout = stderr = None
     p = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+        cmd, stdout=stdout, stderr=stderr,
         shell=True, cwd=cwd)
     stdout, stderr = p.communicate()
     if p.returncode != 0:

Modified: keas.build/trunk/src/keas/build/install.py
===================================================================
--- keas.build/trunk/src/keas/build/install.py	2009-10-02 05:01:33 UTC (rev 104724)
+++ keas.build/trunk/src/keas/build/install.py	2009-10-02 05:25:06 UTC (rev 104725)
@@ -137,11 +137,12 @@
                 version = base.getInput('Version', versions[-1], False)
         # 4. Install the package
         base.do('%s -t 2 -%sc %s%s/%s-%s-%s.cfg' %(
-            self.options.buildout,
-            "vv" if self.options.verbose else "",
-            self.options.url,
-            project,
-            project, variant, version))
+                self.options.buildout,
+                "vv" if self.options.verbose else "",
+                self.options.url,
+                project,
+                project, variant, version),
+                captureOutput=False)
 
 parser = optparse.OptionParser()
 parser.add_option(



More information about the checkins mailing list