Re: [gentoo-portage-dev] [7/7] portage_exec cleanups

[Jason Stubbs <jstubbs@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

Remove the unused code block prior to execve'ing and all the superfluous 
exits. To be specific, if os.execve succeeds then python is gone. If it 
doesn't succeed then an exception will be raised. The previous code raised 
the exception meaning that python would exit (on the child thread side) and 
portage exit handlers would be called. The os._exit(1) and friends weren't 
ever called at all.

[-- Attachment #2: 07-execvp-failure-handling.patch --]
[-- Type: text/x-diff, Size: 880 bytes --]

--- portage_exec.py.orig	2005-10-29 19:21:38.000000000 +0900
+++ portage_exec.py	2005-10-29 19:22:13.000000000 +0900
@@ -100,28 +100,12 @@
 			os.setuid(uid)
 		if umask:
 			os.umask(umask)
-		try:
-			# XXX: We would do this to stop ebuild.sh from getting any
-			# XXX: output, and consequently, we'd get to handle the sigINT.
-			#os.close(sys.stdin.fileno())
-			pass
-		except SystemExit, e:
-			raise
-		except:
-			pass
 
 		try:
-			#print "execing", myc, myargs
 			os.execve(myc,myargs,env)
-		except SystemExit, e:
-			raise
 		except Exception, e:
-			raise str(e)+":\n   "+myc+" "+string.join(myargs)
-		# If the execve fails, we need to report it, and exit
-		# *carefully* --- report error here
-		os._exit(1)
-		sys.exit(1)
-		return # should never get reached
+			print str(e)+":\n   "+myc+" "+string.join(myargs)
+			os._exit(1)
 
 	if logfile:
 		os.close(pw)