diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-03-25 01:04:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-03-25 01:04:57 +0000 |
| commit | d7c7295e4a7f9c3ccb56e65642e236511f8f3e17 (patch) | |
| tree | 7e77b27df712e95916e2c90df30d3c02af12a864 /bin | |
| parent | dfb0b4faf5f80aae2b063180117ffec71532711e (diff) | |
| download | portage-d7c7295e4a7f9c3ccb56e65642e236511f8f3e17.tar.gz portage-d7c7295e4a7f9c3ccb56e65642e236511f8f3e17.tar.bz2 portage-d7c7295e4a7f9c3ccb56e65642e236511f8f3e17.zip | |
Load virtuals on demand in order to avoid needless vdb scanning during a simple 'import portage'. Virtuals are loaded during import, for initialization of portage.settings, only when autouse is enabled (though autouse is disabled by default).
svn path=/main/trunk/; revision=2999
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 4 | ||||
| -rwxr-xr-x | bin/repoman | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 55e9420d1..d705f4a7d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2127,9 +2127,9 @@ def unmerge(unmerge_action, unmerge_files): syslist = [] for x in realsyslist: mycp = portage.dep_getkey(x) - if mycp in portage.settings.virtuals: + if mycp in portage.settings.getvirtuals(): providers = [] - for provider in portage.settings.virtuals[mycp]: + for provider in portage.settings.getvirtuals()[mycp]: if portage.db[portage.root]["vartree"].dbapi.match(provider): providers.append(provider) if len(providers) == 1: diff --git a/bin/repoman b/bin/repoman index 8bce009aa..9ef848b1b 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1115,7 +1115,7 @@ for x in scanlist: for myprovide in myaux["PROVIDE"].split(): prov_cp = portage.dep_getkey(myprovide) - if prov_cp not in dep_settings.virtuals: + if prov_cp not in dep_settings.getvirtuals(): stats["virtual.unavailable"]+=1 fails["virtual.unavailable"].append(x+"/"+y+".ebuild: "+keyword+"("+prof[0]+") "+prov_cp) |