diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-09 01:33:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-09 01:33:41 +0000 |
| commit | 23989b300a7f13f37dbaf6ae19efceca85471f1e (patch) | |
| tree | f5e499a12e2481b7f9bd6b4b7200d72eabf9d30d | |
| parent | 74207d91c2e0f71360578ec702f91971dc5895e0 (diff) | |
| download | portage-23989b300a7f13f37dbaf6ae19efceca85471f1e.tar.gz portage-23989b300a7f13f37dbaf6ae19efceca85471f1e.tar.bz2 portage-23989b300a7f13f37dbaf6ae19efceca85471f1e.zip | |
make.globals should not be relative to config_root
because it only contains constants.
svn path=/main/trunk/; revision=8471
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 8 insertions, 1 deletions
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 |