* [gentoo-commits] portage r15252 - main/branches/2.1.7/pym/portage
@ 2010-01-29 18:48 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2010-01-29 18:48 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2010-01-29 18:48:48 +0000 (Fri, 29 Jan 2010)
New Revision: 15252
Modified:
main/branches/2.1.7/pym/portage/xpak.py
Log:
Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is
generated by the merge process. (trunk r15198)
Modified: main/branches/2.1.7/pym/portage/xpak.py
===================================================================
--- main/branches/2.1.7/pym/portage/xpak.py 2010-01-29 18:48:40 UTC (rev 15251)
+++ main/branches/2.1.7/pym/portage/xpak.py 2010-01-29 18:48:48 UTC (rev 15252)
@@ -86,6 +86,9 @@
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()
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-01-29 18:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-29 18:48 [gentoo-commits] portage r15252 - main/branches/2.1.7/pym/portage Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox