2.1_pre6-r6 regression fix release

(Portage version: 2.1_pre6-r6)

6 files changed, 233 insertions, 15 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 7cb61f869892..3b24980f0d2a 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.95 2006/03/23 03:27:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.96 2006/03/23 10:04:34 zmedico Exp $
+
+*portage-2.1_pre6-r6 (23 Mar 2006)
+
+  23 Mar 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_pre6-r6.ebuild,
+  +files/2.1_pre6/1150_r2974_bug_126442.patch,
+  +files/2.1_pre6/1160_r2979_python_trace.patch:
+  Regression fixes for bug #126442 and new python-trace feature for --debug
+  mode.
 
   22 Mar 2006; Zac Medico <zmedico@gentoo.org> portage-2.1_pre6-r5.ebuild:
   Respect LDFLAGS when compiling tbz2tool.  Thanks to Flameeyes for reporting.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a69bac6a51f1..fdc0838acfc6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dd054d364e9006f0b30089d9670c5c3b ChangeLog 9418
-RMD160 133fe770f572da30778a4a9c5548dbf4ba6a562f ChangeLog 9418
-SHA256 90e897bce1c1144567f47bca46b0b2b577001075c25e012cfccbe217aead9e21 ChangeLog 9418
+MD5 3382e486f9768884d7f64e975149f2f9 ChangeLog 9711
+RMD160 bca44790ad4667dbd0218f92aff1527d3e0e58c8 ChangeLog 9711
+SHA256 e90fbe2cad0d5fa3f69d4c09245bf604ae0353cadfa905d02074ee890a85e5f7 ChangeLog 9711
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -79,6 +79,12 @@ SHA256 611095c6496b7d7c85b290946713c5f09e986b30aea0ee72c543bea61a397d17 files/2.
 MD5 c5dc6c52c74178a2b32fc773bb60f85d files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch 683
 RMD160 ea7ecf8662d49b4368717b62b98af699ac4f3f7c files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch 683
 SHA256 458170db1bf28cc788b5b1ace204148a7fe51867d10a4f92aa8a2aef0ddb530d files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch 683
+MD5 d59aef805950be4c5fafbf93c1d52c4c files/2.1_pre6/1150_r2974_bug_126442.patch 1815
+RMD160 a3d4e81b803ef1f984ed2fc14ef1e4b15b0a2c62 files/2.1_pre6/1150_r2974_bug_126442.patch 1815
+SHA256 4308ff4d223c9802581fd2fd254291d6a05a2608584258b2cfc86a21bba1fdb4 files/2.1_pre6/1150_r2974_bug_126442.patch 1815
+MD5 f59860a7e10805f95e4b89bd08900ad9 files/2.1_pre6/1160_r2979_python_trace.patch 4224
+RMD160 cb0b7065e7f0ef0628d0aa9ede4a110e40488b56 files/2.1_pre6/1160_r2979_python_trace.patch 4224
+SHA256 07b58bd7326ae3a6d8c03aeb877656b4712e60d4b22ab83fe84728976f6cb9c6 files/2.1_pre6/1160_r2979_python_trace.patch 4224
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -97,9 +103,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di
 MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r4 253
 RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r4 253
 SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r4 253
-MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r5 253
-RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r5 253
-SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r5 253
+MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r6 253
+RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r6 253
+SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r6 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -121,13 +127,13 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-
 MD5 f1758097241d74ff2fbfecea1e831732 portage-2.1_pre5-r4.ebuild 5072
 RMD160 381f37b7fc7c2fd218fff4375f9f7672e4c69d10 portage-2.1_pre5-r4.ebuild 5072
 SHA256 f21564ed3d7f7ac1822464e8bc21d1f69cefe418582fba1ba6f146841899e99c portage-2.1_pre5-r4.ebuild 5072
-MD5 17eb2923822ef0d2b8307c0b1fdc952e portage-2.1_pre6-r5.ebuild 5712
-RMD160 9f2a38d4ce31fb3b9f9560725f7305e298b64a28 portage-2.1_pre6-r5.ebuild 5712
-SHA256 cc7f7bcdad900963fbaa9b997cea46bbd60b00009dc77220697bb7d5b8d60d61 portage-2.1_pre6-r5.ebuild 5712
+MD5 0c4896b72af568f74c183906eade39b4 portage-2.1_pre6-r6.ebuild 5774
+RMD160 5971f90c32f31e877d47baef99c6b43326f70abd portage-2.1_pre6-r6.ebuild 5774
+SHA256 4c51409e5e249a8c932a489f77654216e588f5ef1c5abc3eddd8763d336fc41b portage-2.1_pre6-r6.ebuild 5774
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEIhWd/ejvha5XGaMRAiwYAKDD5PpYxJ5ipIwRLTAbYlhLeuehqgCg8PpG
-a/n9HH8aNlWYzzAGnnNkL7E=
-=tWcP
+iD8DBQFEInDn/ejvha5XGaMRAuYpAKCunmhNAZCvBJbm0Bo31ZiFhi+ztwCgzD2h
+oHBASQniAnGHdCsKdCtFuXo=
+=OpMj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre6/1150_r2974_bug_126442.patch b/sys-apps/portage/files/2.1_pre6/1150_r2974_bug_126442.patch
new file mode 100644
index 000000000000..ff760f252b7f
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1150_r2974_bug_126442.patch
@@ -0,0 +1,51 @@
+=== modified file 'bin/ebuild.sh'
+--- bin/ebuild.sh	
++++ bin/ebuild.sh	
+@@ -42,7 +42,15 @@
+ OCXX="$CXX"
+ source /etc/profile.env &>/dev/null
+ if [ -f "${PORTAGE_BASHRC}" ]; then
+-	source "${PORTAGE_BASHRC}"
++	# If $- contains x, then tracing has already enabled elsewhere for some
++	# reason.  We preserve it's state so as not to interfere.
++	if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
++		source "${PORTAGE_BASHRC}"
++	else
++		set -x
++		source "${PORTAGE_BASHRC}"
++		set +x
++	fi
+ fi
+ [ ! -z "$OCC" ] && export CC="$OCC"
+ [ ! -z "$OCXX" ] && export CXX="$OCXX"
+
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -2389,10 +2389,13 @@
+ 	if phase_retval == os.EX_OK:
+ 		if mydo == "install":
+ 			mycommand = " ".join([MISC_SH_BINARY, "install_qa_check"])
+-			return spawn(mycommand, mysettings, debug=debug,
++			qa_retval = spawn(mycommand, mysettings, debug=debug,
+ 				droppriv=actionmap[mydo]["args"][0],
+ 				free=actionmap[mydo]["args"][1],
+ 				sesandbox=actionmap[mydo]["args"][2], logfile=logfile)
++			if qa_retval:
++				writemsg("!!! install_qa_check failed; exiting.\n")
++			return qa_retval
+ 	return phase_retval
+ 
+ # chunked out deps for each phase, so that ebuild binary can use it 
+@@ -2769,7 +2772,9 @@
+ 			# Post phase logic and tasks that have been factored out of ebuild.sh.
+ 			myargs = [MISC_SH_BINARY, "preinst_mask", "preinst_sfperms",
+ 				"preinst_selinux_labels", "preinst_suid_scan"]
+-			spawn(" ".join(myargs), mysettings, debug=debug, free=1, logfile=logfile)
++			phase_retval = spawn(" ".join(myargs), mysettings, debug=debug, free=1, logfile=logfile)
++			if phase_retval != os.EX_OK:
++				writemsg("!!! post preinst failed; exiting.\n")
+ 		del mysettings["IMAGE"]
+ 		return phase_retval
+ 	elif mydo in ["prerm","postrm","postinst","config"]:
+
diff --git a/sys-apps/portage/files/2.1_pre6/1160_r2979_python_trace.patch b/sys-apps/portage/files/2.1_pre6/1160_r2979_python_trace.patch
new file mode 100644
index 000000000000..04212b8edd32
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1160_r2979_python_trace.patch
@@ -0,0 +1,151 @@
+=== added file 'pym/portage_debug.py'
+--- /dev/null	
++++ pym/portage_debug.py	
+@@ -0,0 +1,116 @@
++# Copyright 1999-2006 Gentoo Foundation
++# Distributed under the terms of the GNU General Public License v2
++# $Header: $
++
++import os, sys, threading
++
++import portage_const
++from portage_util import writemsg
++
++def set_trace(on=True):
++	if on:
++		t = trace_handler()
++		threading.settrace(t.event_handler)
++		sys.settrace(t.event_handler)
++	else:
++		sys.settrace(None)
++		threading.settrace(None)
++
++class trace_handler(object):
++
++	def __init__(self):
++		python_base = None
++		for x in sys.path:
++			if os.path.basename(x).startswith("python2."):
++				python_base = x
++				break
++
++		self.ignore_prefixes = []
++		if python_base is not None:
++			self.ignore_prefixes.append(python_base + os.sep)
++
++		self.trim_filename = prefix_trimmer(os.path.join(portage_const.PORTAGE_BASE_PATH, "pym") + os.sep).trim
++		self.show_local_lines = False
++		self.max_repr_length = 200
++
++	def event_handler(self, *args):
++		frame, event, arg = args
++		if "line" == event:
++			if self.show_local_lines:
++				self.trace_line(*args)
++		else:
++			if not self.ignore_filename(frame.f_code.co_filename):
++				self.trace_event(*args)
++				return self.event_handler
++
++	def trace_event(self, frame, event, arg):
++		writemsg("%s line=%d name=%s event=%s %slocals=%s\n" % \
++		(self.trim_filename(frame.f_code.co_filename),
++		frame.f_lineno,
++		frame.f_code.co_name,
++		event,
++		self.arg_repr(frame, event, arg),
++		self.locals_repr(frame, event, arg)))
++
++	def arg_repr(self, frame, event, arg):
++		my_repr = None
++		if "return" == event:
++			my_repr = repr(arg)
++			if len(my_repr) > self.max_repr_length:
++				my_repr = "'omitted'"
++			return "value=%s " % my_repr
++		elif "exception" == event:
++			my_repr = repr(arg[1])
++			if len(my_repr) > self.max_repr_length:
++				my_repr = "'omitted'"
++			return "type=%s value=%s " % (arg[0], my_repr)
++
++		return ""
++
++	def trace_line(self, frame, event, arg):
++		writemsg("%s line=%d\n" % (self.trim_filename(frame.f_code.co_filename), frame.f_lineno))
++
++	def ignore_filename(self, filename):
++		if filename:
++			for x in self.ignore_prefixes:
++				if filename.startswith(x):
++					return True
++		return False
++
++	def locals_repr(self, frame, event, arg):
++		"""Create a representation of the locals dict that is suitable for
++		tracing output."""
++
++		my_locals = frame.f_locals.copy()
++
++		# prevent unsafe  __repr__ call on self when __init__ is called
++		# (method calls aren't safe until after __init__  has completed).
++		if frame.f_code.co_name == "__init__" and "self" in my_locals:
++			my_locals["self"] = "omitted"
++
++		# We omit items that will lead to unreasonable bloat of the trace
++		# output (and resulting log file).
++		for k, v in my_locals.iteritems():
++			my_repr = repr(v)
++			if len(my_repr) > self.max_repr_length:
++				my_locals[k] = "omitted"
++		return my_locals
++
++class prefix_trimmer(object):
++	def __init__(self, prefix):
++		self.prefix = prefix
++		self.cut_index = len(prefix)
++		self.previous = None
++		self.previous_trimmed = None
++
++	def trim(self, s):
++		"""Remove a prefix from the string and return the result.
++		The previous result is automatically cached."""
++		if s == self.previous:
++			return self.previous_trimmed
++		else:
++			if s.startswith(self.prefix):
++				self.previous_trimmed = s[self.cut_index:]
++			else:
++				self.previous_trimmed = s
++			return self.previous_trimmed
+
+=== modified file 'bin/ebuild'
+--- bin/ebuild	
++++ bin/ebuild	
+@@ -24,6 +24,11 @@
+ sys.path = ["/usr/lib/portage/pym"]+sys.path
+ 
+ import portage, portage_util, portage_const
++
++# do this _after_ 'import portage' to prevent unnecessary tracing
++if debug and "python-trace" in portage.features:
++	import portage_debug
++	portage_debug.set_trace(True)
+ 
+ if portage.settings["NOCOLOR"] in ("yes","true") or not sys.stdout.isatty():
+ 	import output
+
+=== modified file 'bin/emerge'
+--- bin/emerge	
++++ bin/emerge	
+@@ -398,6 +398,9 @@
+ 	portage.settings.backup_changes("PORTAGE_DEBUG")
+ 	portage.debug=1
+ 	portage.settings.lock()
++	if "python-trace" in portage.features:
++		import portage_debug
++		portage_debug.set_trace(True)
+ 
+ if ("--resume" in myopts):
+ 	if "--tree" in myopts:
+
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre6-r5 b/sys-apps/portage/files/digest-portage-2.1_pre6-r6
index b5fd1fd89f2d..b5fd1fd89f2d 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre6-r5
+++ b/sys-apps/portage/files/digest-portage-2.1_pre6-r6
diff --git a/sys-apps/portage/portage-2.1_pre6-r5.ebuild b/sys-apps/portage/portage-2.1_pre6-r6.ebuild
index 9123013e3e19..b7ad9fadcd17 100644
--- a/sys-apps/portage/portage-2.1_pre6-r5.ebuild
+++ b/sys-apps/portage/portage-2.1_pre6-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r5.ebuild,v 1.2 2006/03/23 03:27:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r6.ebuild,v 1.1 2006/03/23 10:04:34 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -45,7 +45,9 @@ src_unpack() {
 		1110_r2947_bug_126711_selinux_context.patch
 		1120_r2952_bug_126756_nocolor_ebuild.patch
 		1130_r2942_inst_uid_gid_defaults.patch
-		1140_r2963_bug_126711_sandbox.patch"
+		1140_r2963_bug_126711_sandbox.patch
+		1150_r2974_bug_126442.patch
+		1160_r2979_python_trace.patch"
 	for patch_name in ${my_patches}; do
 		einfo "Applying ${patch_name} ..."
 		patch -p0 --no-backup-if-mismatch < "${FILESDIR}"/${PV}/${patch_name} >/dev/null || die "Failed to apply patch"