From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 17 Oct 2011 02:51:00 +0000 (-0700)
Subject: repoman: handle subprocess bug with Python 3.1
X-Git-Tag: v2.2.0_alpha68~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=753d35cb6784fc361c9804800355ff8b6b70a247;p=portage.git

repoman: handle subprocess bug with Python 3.1
---

diff --git a/bin/repoman b/bin/repoman
index efd8a01ad..ba810c66c 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2466,7 +2466,15 @@ else:
 			portage.writemsg_stdout("(%s)\n" % " ".join(add_cmd),
 				noiselevel=-1)
 		else:
-			add_cmd = [_unicode_encode(arg) for arg in add_cmd]
+			if not (sys.hexversion >= 0x3000000 and sys.hexversion < 0x3020000):
+				# Python 3.1 produces the following TypeError if raw bytes are
+				# passed to subprocess.call():
+				#   File "/usr/lib/python3.1/subprocess.py", line 646, in __init__
+				#     errread, errwrite)
+				#   File "/usr/lib/python3.1/subprocess.py", line 1157, in _execute_child
+				#     raise child_exception
+				# TypeError: expected an object with the buffer interface
+				add_cmd = [_unicode_encode(arg) for arg in add_cmd]
 			retcode = subprocess.call(add_cmd)
 			if retcode != os.EX_OK:
 				logging.error(