class: AbstractOperatingSystem
authorClaus Gittinger <cg@exept.de>
Sat, 13 Jul 2013 22:40:45 +0200
changeset 15520 1a6b940ae4a6
parent 15519 16eaca36aac8
child 15521 cd0f31cdec97
class: AbstractOperatingSystem changed: #getCommandOutputFrom:maxNumberOfLines:errorDisposition: use asNilIfEmpty
AbstractOperatingSystem.st
--- a/AbstractOperatingSystem.st	Sat Jul 13 22:35:11 2013 +0200
+++ b/AbstractOperatingSystem.st	Sat Jul 13 22:40:45 2013 +0200
@@ -1826,33 +1826,30 @@
     |result|
 
     PipeFailed ~~ true ifTrue:[
-	PipeStream openErrorSignal handle:[:ex |
-	    PipeFailed := true.
-	    'OperatingSystem [warning]: cannot fork/popen' errorPrintCR.
-	    ex return.
-	] do:[
-	    |p line|
-
-	    p := PipeStream
-		    readingFrom:aCommand
-		    errorDisposition:errorDisposition
-		    inDirectory:nil.
-	    result := StringCollection new.
-	    [p atEnd] whileFalse:[
-		line := p nextLine.
-		(numLinesOrNil isNil
-		or:[result size < numLinesOrNil]) ifTrue:[
-		    result add:line
-		].
-	    ].
-	    p close.
-	    (p exitStatus notNil
-	    and:[p exitStatus success]) ifFalse:[
-		result isEmpty ifTrue:[
-		    result := nil
-		]
-	    ].
-	].
+        PipeStream openErrorSignal handle:[:ex |
+            PipeFailed := true.
+            'OperatingSystem [warning]: cannot fork/popen' errorPrintCR.
+            ex return.
+        ] do:[
+            |p line|
+
+            p := PipeStream
+                    readingFrom:aCommand
+                    errorDisposition:errorDisposition
+                    inDirectory:nil.
+            result := StringCollection new.
+            [p atEnd] whileFalse:[
+                line := p nextLine.
+                (numLinesOrNil isNil
+                or:[result size < numLinesOrNil]) ifTrue:[
+                    result add:line
+                ].
+            ].
+            p close.
+            (p exitStatus notNil and:[p exitStatus success]) ifFalse:[
+                result := result asNilIfEmpty
+            ].
+        ].
     ].
     ^ result
 
@@ -7264,11 +7261,11 @@
 !AbstractOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.241 2013-07-11 14:59:06 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.242 2013-07-13 20:40:45 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.241 2013-07-11 14:59:06 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.242 2013-07-13 20:40:45 cg Exp $'
 ! !