| 1 |
commit: d6bce25590c9b351fe833056a89c1dd0fc91ba47 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 20:55:07 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 20:55:07 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d6bce255 |
| 7 |
|
| 8 |
action_metadata: use auxdbkeys to compare entries |
| 9 |
|
| 10 |
This borrows the approach that egencache uses since commit |
| 11 |
0e120da008c9d0d41c9372c81145c6e153028a6d. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/_emerge/actions.py | 8 +------- |
| 15 |
1 files changed, 1 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 18 |
index 610a6c4..6ccf894 100644 |
| 19 |
--- a/pym/_emerge/actions.py |
| 20 |
+++ b/pym/_emerge/actions.py |
| 21 |
@@ -1779,13 +1779,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None): |
| 22 |
# We don't want to skip the write unless we're really |
| 23 |
# sure that the existing cache is identical, so don't |
| 24 |
# trust _mtime_ and _eclasses_ alone. |
| 25 |
- keys = set() |
| 26 |
- keys.update(src) |
| 27 |
- keys.update(dest) |
| 28 |
- keys.discard('_eclasses_') |
| 29 |
- keys.discard('_mtime_') |
| 30 |
- keys.discard(src_chf_key) |
| 31 |
- for k in keys: |
| 32 |
+ for k in auxdbkeys: |
| 33 |
if dest.get(k, '') != src.get(k, ''): |
| 34 |
dest = None |
| 35 |
break |
Archives