From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 13 Jan 2010 20:35:06 +0000 (-0000)
Subject: Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is
X-Git-Tag: v2.2_rc62~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11afbedb749a78054d8c3337b1f32e03fd5f8c48;p=portage.git

Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is
generated by the merge process.

svn path=/main/trunk/; revision=15198
---

diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index 262f14c85..7d595bdab 100644
--- a/pym/portage/xpak.py
+++ b/pym/portage/xpak.py
@@ -86,6 +86,9 @@ def xpak(rootdir,outfile=None):
 	mylist.sort()
 	mydata = {}
 	for x in mylist:
+		if x == 'CONTENTS':
+			# CONTENTS is generated during the merge process.
+			continue
 		x = _unicode_encode(x, encoding=_encodings['fs'], errors='strict')
 		mydata[x] = open(os.path.join(rootdir, x), 'rb').read()