Author: gnichols
Date: 2010-01-12 16:14:46 +0000 (Tue, 12 Jan 2010)
New Revision: 287
Modified:
trunk/v7/command.py
Log:
488145 - FEAT: HTS should provide a run-time dependency option for installation
Modified: trunk/v7/command.py
===================================================================
--- trunk/v7/command.py 2010-01-12 16:14:15 UTC (rev 286)
+++ trunk/v7/command.py 2010-01-12 16:14:46 UTC (rev 287)
@@ -48,21 +48,12 @@
(output, errors) = self.pipe.communicate()
if output:
self.output = output.splitlines()
- # make the last line has the new line at the end
- if self.output[-1][-1:] != '\n':
- self.output[-1] = self.output[-1] + '\n'
if errors:
self.errors = errors.splitlines()
- # make the last line has the new line at the end
- if self.errors[-1][-1:] != '\n':
- self.errors[-1] = self.output[-1] + '\n'
self.returnValue = (self.pipe.returncode >> 8) & 0xFF
self.signal = self.pipe.returncode & 0xFF
- if self.errors:
- for line in self.errors:
- sys.stderr.write( line )
- sys.stderr.flush()
+ self.printErrors()
def _checkErrors(self):
@@ -101,12 +92,14 @@
if self.output:
for line in self.output:
sys.stdout.write( line )
+ sys.stdout.write("\n")
sys.stdout.flush()
def printErrors(self):
if self.errors:
for line in self.errors:
sys.stderr.write( line )
+ sys.stderr.write("\n")
sys.stderr.flush()
Show replies by date