[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     efe4b99bd72d4ac9b13b5885c33cc3f8bd6059f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 20:58:46 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 20:58:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=efe4b99b

pty: disable the use of openpty on FreeMiNT

As reported by Alan Hourihane, openpty seems not to work at all, making
Portage non-usable, so disable it, like we do for Solaris.

---
 pym/portage/util/_pty.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py
index f45ff0a..db1c9ac 100644
--- a/pym/portage/util/_pty.py
+++ b/pym/portage/util/_pty.py
@@ -131,9 +131,12 @@ else:
 	# Disable the use of openpty on Solaris as it seems Python's openpty
 	# implementation doesn't play nice on Solaris with Portage's
 	# behaviour causing hangs/deadlocks.
+	# Similarly, on FreeMiNT, reading just always fails, causing Portage
+	# to think the system is malfunctioning, and returning that as error
+	# message.
 	# Additional note for the future: on Interix, pipes do NOT work, so
 	# _disable_openpty on Interix must *never* be True
-	_disable_openpty = platform.system() in ("SunOS",)
+	_disable_openpty = platform.system() in ("SunOS", "FreeMiNT",)
 _tested_pty = False
 
 if not _can_test_pty_eof():

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     03ddbaadd7667b41d7d89f4018aa5b8bcf51f657
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 09:21:54 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 28 09:21:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=03ddbaad

sleep_for_mtime_granularity: remove

Remove trails from long gone sleep_for_mtime_granularity, that were
still in the Prefix branch, because some functionality was factored out
in a function in order to be able to easily skip it.

---
 pym/portage/util/env_update.py |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index 70b7356..ea3bef1 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -118,12 +118,9 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
 		env.update(myconfig)
 
 	if EPREFIX == '':
-		sleep_for_mtime_granularity = dolinkingstuff(
-				target_root, specials, prelink_capable,
+		dolinkingstuff(target_root, specials, prelink_capable,
 				makelinks, contents, prev_mtimes, env)
-	else:
-		sleep_for_mtime_granularity = False
-	writeshellprofile(target_root, env, sleep_for_mtime_granularity)
+	writeshellprofile(target_root, env)
 
 def dolinkingstuff(target_root, specials, prelink_capable, makelinks,
 		contents, prev_mtimes, env):
@@ -275,9 +272,7 @@ def dolinkingstuff(target_root, specials, prelink_capable, makelinks,
 
 	del specials["LDPATH"]
 
-	return sleep_for_mtime_granularity
-
-def writeshellprofile(target_root, env, sleep_for_mtime_granularity):
+def writeshellprofile(target_root, env):
 	penvnotice  = "# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.\n"
 	penvnotice += "# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES\n"
 	cenvnotice  = penvnotice[:]

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     2e1d6a48af3e85fb938f8e6633ef3b41d5ac50d2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 17:40:22 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 17:40:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2e1d6a48

Disable openpty on FreeMiNT too, bug #397613

---
 pym/portage/util/_pty.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py
index 95082cf..1cde8f7 100644
--- a/pym/portage/util/_pty.py
+++ b/pym/portage/util/_pty.py
@@ -14,7 +14,7 @@ from portage.util import writemsg
 # behaviour causing hangs/deadlocks.
 # Additional note for the future: on Interix, pipes do NOT work, so
 # _disable_openpty on Interix must *never* be True
-_disable_openpty = platform.system() in ("SunOS",)
+_disable_openpty = platform.system() in ("SunOS","FreeMiNT",)
 
 _fbsd_test_pty = platform.system() == 'FreeBSD'
 

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     1b78b6c3ede539f2fc0b7c68918c47b147832540
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 00:51:07 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 18:33:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1b78b6c3

_copyxattr: ignore EOPNOTSUPP from xattr.list()

---
 pym/portage/util/movefile.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 1f92b59..8ce80f1 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -100,16 +100,10 @@ else:
 
 			try:
 				attrs = xattr.list(src)
-				raise_exception = False
 			except IOError as e:
-				raise_exception = True
 				if e.errno != OperationNotSupported.errno:
 					raise
-			if raise_exception:
-				raise OperationNotSupported(
-					_("Filesystem containing file '%s' "
-					"does not support listing of extended attributes") %
-					(_unicode_decode(src),))
+				attrs = ()
 
 			if attrs:
 				if exclude is not None and isinstance(attrs[0], bytes):

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     40f7095d9f894400b06a08ba62b318d28465036c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 09:36:12 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 18:33:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=40f7095d

_copyxattr: ignore EOPNOTSUPP from os.listxattr()

This will fix bug #484540.

---
 pym/portage/util/movefile.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 8ce80f1..e9b01be 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -72,7 +72,12 @@ if hasattr(_os, "getxattr"):
 	# Python >=3.3 and GNU/Linux
 	def _copyxattr(src, dest, exclude=None):
 
-		attrs = _os.listxattr(src)
+		try:
+			attrs = _os.listxattr(src)
+		except OSError as e:
+			if e.errno != OperationNotSupported.errno:
+				raise
+			attrs = ()
 		if attrs:
 			if exclude is not None and isinstance(attrs[0], bytes):
 				exclude = exclude.encode(_encodings['fs'])

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     40e02fb83828c83f909a3a0366d178aa6bcc7c93
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 16 16:47:59 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 18:33:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=40e02fb8

portage.util.atomic_ofstream.__init__(): Fix compatibility with Python <2.6.5.
Reported by Stephen Klimaszewski.

---
 pym/portage/util/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 25211d9..f599b2b 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1249,7 +1249,7 @@ class atomic_ofstream(ObjectProxy):
 				object.__setattr__(self, '_file',
 					open_func(_unicode_encode(tmp_name,
 						encoding=_encodings['fs'], errors='strict'),
-						mode=mode, **kargs))
+						mode=mode, **portage._native_kwargs(kargs)))
 				return
 			except IOError as e:
 				if canonical_path == filename:

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     dde7fb0919d40cc5585e8a603046e7098371ad69
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 10 01:45:31 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 13:50:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dde7fb09

let env-update call ldconfig if it exists

    In Prefix, let env-update call ldconfig if it exists.

    It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 pym/portage/util/env_update.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index ace492c..5e732ad 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
 		if not libdir_contents_changed:
 			makelinks = False
 
-	ldconfig = "/sbin/ldconfig"
+	ldconfig = eprefix + "/sbin/ldconfig"
 	if "CHOST" in settings and "CBUILD" in settings and \
 		settings["CHOST"] != settings["CBUILD"]:
 		ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
+	elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)):
+		ldconfig = None
 
 	# Only run ldconfig as needed
-	if makelinks and ldconfig and not eprefix:
+	if makelinks and ldconfig:
 		# ldconfig has very different behaviour between FreeBSD and Linux
 		if ostype == "Linux" or ostype.lower().endswith("gnu"):
 			# We can't update links if we haven't cleaned other versions first, as

[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

[Fabian Groffen]

commit:     9607fb432f1333774bf6994166e2fa7e96616b6d
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 16:39:58 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 06:55:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9607fb43

disable openpty on more unices

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 pym/portage/util/_pty.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py
index 13e468b..a92f575 100644
--- a/pym/portage/util/_pty.py
+++ b/pym/portage/util/_pty.py
@@ -9,12 +9,12 @@ from portage import os
 from portage.output import get_term_size, set_term_size
 from portage.util import writemsg
 
-# Disable the use of openpty on Solaris as it seems Python's openpty
-# implementation doesn't play nice on Solaris with Portage's
-# behaviour causing hangs/deadlocks.
+# Disable the use of openpty on Solaris (and others) as it seems Python's
+# openpty implementation doesn't play nice with Portage's behaviour,
+# causing hangs/deadlocks.
 # Additional note for the future: on Interix, pipes do NOT work, so
 # _disable_openpty on Interix must *never* be True
-_disable_openpty = platform.system() in ("SunOS","FreeMiNT",)
+_disable_openpty = platform.system() in ("AIX","FreeMiNT","HP-UX","SunOS",)
 
 _fbsd_test_pty = platform.system() == 'FreeBSD'