diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-13 20:35:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-13 20:35:06 +0000 |
| commit | 11afbedb749a78054d8c3337b1f32e03fd5f8c48 (patch) | |
| tree | 19759f413c0afdc0bb7a3a3549cf4c30d1859e1a | |
| parent | c693312f55cf05074746e39939edd80562353c70 (diff) | |
| download | portage-11afbedb749a78054d8c3337b1f32e03fd5f8c48.tar.gz portage-11afbedb749a78054d8c3337b1f32e03fd5f8c48.tar.bz2 portage-11afbedb749a78054d8c3337b1f32e03fd5f8c48.zip | |
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.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() |