diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:48:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:48:48 +0000 |
| commit | e2d1bb6781156c9850e75281e8682d10c84216db (patch) | |
| tree | e9b8d0e5f34ed3fac4743fcb600560e80d675a7f | |
| parent | 6a6452569b028da0691c11839a30a43ed246a7bd (diff) | |
| download | portage-e2d1bb6781156c9850e75281e8682d10c84216db.tar.gz portage-e2d1bb6781156c9850e75281e8682d10c84216db.tar.bz2 portage-e2d1bb6781156c9850e75281e8682d10c84216db.zip | |
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
| -rw-r--r-- | pym/portage/xpak.py | 3 |
1 files changed, 3 insertions, 0 deletions
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() |