From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Jan 2010 18:48:48 +0000 (-0000)
Subject: Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is
X-Git-Tag: v2.1.7.17~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2d1bb6781156c9850e75281e8682d10c84216db;p=portage.git

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

svn path=/main/branches/2.1.7/; revision=15252
---

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()