From 11afbedb749a78054d8c3337b1f32e03fd5f8c48 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 13 Jan 2010 20:35:06 +0000 Subject: [PATCH] Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is generated by the merge process. svn path=/main/trunk/; revision=15198 --- pym/portage/xpak.py | 3 +++ 1 file changed, 3 insertions(+) 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() -- 2.26.2