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 262f14c854a0f17e4eacb43cb3cc15282b4db183..7d595bdab33500009798446efa825b1aecf39ebb 100644 (file)
--- 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()