| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-29 18:48:48 +0000 (Fri, 29 Jan 2010) |
| 3 |
New Revision: 15252 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/pym/portage/xpak.py |
| 7 |
Log: |
| 8 |
Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg since contents is |
| 9 |
generated by the merge process. (trunk r15198) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.7/pym/portage/xpak.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.7/pym/portage/xpak.py 2010-01-29 18:48:40 UTC (rev 15251) |
| 14 |
+++ main/branches/2.1.7/pym/portage/xpak.py 2010-01-29 18:48:48 UTC (rev 15252) |
| 15 |
@@ -86,6 +86,9 @@ |
| 16 |
mylist.sort() |
| 17 |
mydata = {} |
| 18 |
for x in mylist: |
| 19 |
+ if x == 'CONTENTS': |
| 20 |
+ # CONTENTS is generated during the merge process. |
| 21 |
+ continue |
| 22 |
x = _unicode_encode(x, encoding=_encodings['fs'], errors='strict') |
| 23 |
mydata[x] = open(os.path.join(rootdir, x), 'rb').read() |
Archives