Merge pull request #1238 from marineam/portage

portage: fix error handling for for fetching binhost package list

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask

@@ -15,6 +15,3 @@
 # Require our ca-certificates package based directly on Mozilla's
 # certificate store provided in NSS rather than the Gentoo/Debian package.
 >=app-misc/ca-certificates-20000000
-
-# Broken when binpkg location is missing
-=sys-apps/portage-2.2.18

sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0001-portage-repository-config.py-add-disabled-attribute-.patch

@@ -1,7 +1,7 @@
 From 1b8ccc0e487a523aa6d974b3ebe26548ad6502b6 Mon Sep 17 00:00:00 2001
 From: Alex Crawford <alex.crawford@coreos.com>
 Date: Mon, 14 Apr 2014 12:43:56 -0700
-Subject: [PATCH 1/3] portage/repository/config.py: add disabled attribute to
+Subject: [PATCH 1/4] portage/repository/config.py: add disabled attribute to
  repos.conf
 
 This flag allows a repos.conf file to disable a previously-defined repository.

sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch

@@ -1,7 +1,7 @@
 From f1ca1359c9cc2bd9e867305e1b07506d3d6722cc Mon Sep 17 00:00:00 2001
 From: Michael Marineau <mike@marineau.org>
 Date: Sun, 20 Jul 2014 20:27:43 -0700
-Subject: [PATCH 2/3] environment: Filter EROOT for all EAPIs
+Subject: [PATCH 2/4] environment: Filter EROOT for all EAPIs
 
 This variable is often defined in older EAPIs with "${EROOT:=$ROOT}"
 but it should never be preserved since ROOT may change. Bug #490014

sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch

@@ -1,7 +1,7 @@
 From a4329f54504afedc0840d42faf5f15a158fdaada Mon Sep 17 00:00:00 2001
 From: Michael Marineau <mike@marineau.org>
 Date: Mon, 27 Apr 2015 18:33:11 -0700
-Subject: [PATCH 3/3] depgraph: ensure slot rebuilds happen in the correct root
+Subject: [PATCH 3/4] depgraph: ensure slot rebuilds happen in the correct root
 
 https://bugs.gentoo.org/show_bug.cgi?id=520112
 ---

sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0004-bintree.py-do-not-pass-unicode-encoding-with-non-str.patch

@@ -0,0 +1,34 @@
+From 9b47840a394c098694943319fcfaab697cc4f9f5 Mon Sep 17 00:00:00 2001
+From: Michael Marineau <mike@marineau.org>
+Date: Wed, 29 Apr 2015 19:08:05 -0700
+Subject: [PATCH 4/4] bintree.py: do not pass unicode encoding with non-string
+ type
+
+unicode() cannot specify an encoding when converting arbitrary objects
+such as exceptions. Doing so results in a TypeError.
+
+Fixes commit 4496ee37d6fa327ada635c67500e82f830141a9e.
+
+X-Gentoo-Bug: 532784
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=532784
+---
+ pym/portage/dbapi/bintree.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
+index cd30b67..aa4508b 100644
+--- a/pym/portage/dbapi/bintree.py
++++ b/pym/portage/dbapi/bintree.py
+@@ -1030,8 +1030,7 @@ class binarytree(object):
+ 				# With Python 2, the EnvironmentError message may
+ 				# contain bytes or unicode, so use _unicode to ensure
+ 				# safety with all locales (bug #532784).
+-				writemsg("!!! %s\n\n" % _unicode(e,
+-					_encodings["stdio"], errors="replace"))
++				writemsg("!!! %s\n\n" % _unicode(e))
+ 				del e
+ 				pkgindex = None
+ 			if proc is not None:
+-- 
+2.0.5
+