aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-01-13 20:35:06 (GMT)
committerZac Medico <zmedico@gentoo.org>2010-01-13 20:35:06 (GMT)
commit11afbedb749a78054d8c3337b1f32e03fd5f8c48 (patch)
tree19759f413c0afdc0bb7a3a3549cf4c30d1859e1a
parentUse encoded byte strings with python-2.x, since the python ebuilds are (diff)
downloadportage-11afbedb749a78054d8c3337b1f32e03fd5f8c48.zip
portage-11afbedb749a78054d8c3337b1f32e03fd5f8c48.tar.gz
portage-11afbedb749a78054d8c3337b1f32e03fd5f8c48.tar.bz2
Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is
generated by the merge process. svn path=/main/trunk/; revision=15198
-rw-r--r--pym/portage/xpak.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index 262f14c..7d595bd 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()