From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 Nov 2007 01:33:41 +0000 (-0000)
Subject: make.globals should not be relative to config_root
X-Git-Tag: v2.2_pre1~421
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23989b300a7f13f37dbaf6ae19efceca85471f1e;p=portage.git

make.globals should not be relative to config_root
because it only contains constants.

svn path=/main/trunk/; revision=8471
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 12f8eaf25..a21f29283 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1125,8 +1125,10 @@ class config(object):
 				self.puseforce_list.append(cpdict)
 			del rawpuseforce
 
+			# make.globals should not be relative to config_root
+			# because it only contains constants.
 			try:
-				self.mygcfg   = getconfig(os.path.join(config_root, "etc", "make.globals"))
+				self.mygcfg   = getconfig(os.path.join("/etc", "make.globals"))
 
 				if self.mygcfg is None:
 					self.mygcfg = {}
@@ -2614,6 +2616,11 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero
 				writemsg("openpty failed: '%s'\n" % str(e), noiselevel=1)
 				del e
 				master_fd, slave_fd = os.pipe()
+		if got_pty:
+			import termios
+			mode = termios.tcgetattr(slave_fd)
+			mode[1] &= ~termios.OPOST
+			termios.tcsetattr(slave_fd, termios.TCSANOW, mode)
 
 		# We must set non-blocking mode before we close the slave_fd
 		# since otherwise the fcntl call can fail on FreeBSD (the child