[gentoo-commits] proj/gentoopm:master commit in: gentoopm/bash/

["Michał Górny" <mgorny@gentoo.org>]

commit:     dc7905fbd4aa0ec1305cf4b246794f8b7de0f328
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 21:21:22 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 21:21:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=dc7905fb

Fix looping BashServer when pipes are closed.

Ensure BashServer will exit when stdin is closed (read returns non-zero)
rather than letting it loop and eat CPU.

---
 gentoopm/bash/bashserver.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gentoopm/bash/bashserver.py b/gentoopm/bash/bashserver.py
index 98d5ede..774c741 100644
--- a/gentoopm/bash/bashserver.py
+++ b/gentoopm/bash/bashserver.py
@@ -9,12 +9,15 @@ from gentoopm.bash import BashParser
 from gentoopm.exceptions import InvalidBashCodeError
 
 _bash_script = '''
-while true; do
+while
 	(
 		while read -r __GENTOOPM_CMD; do
 			eval ${__GENTOOPM_CMD}
 		done
+		exit 1
 	)
+do
+	:
 done
 '''
 
@@ -37,7 +40,7 @@ class BashServer(BashParser):
 		shutil.copyfileobj(envf, f)
 		f.flush()
 
-		self._write('break',
+		self._write('exit 0',
 				'source %s && printf "OK\\0" || printf "FAIL\\0"' % repr(f.name))
 		resp = self._read1()
 		f.close()