diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-25 02:05:14 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-25 02:05:14 -0700 |
commit | 79a55ae35806baf6bef3436df2afca76c6454b2a (patch) | |
tree | c8d69e74bffac330f99e5311e3d087ad66fbc924 | |
parent | e10933cbc64fe631699805194b23f258656ed2f0 (diff) | |
download | portage-79a55ae35806baf6bef3436df2afca76c6454b2a.tar.gz portage-79a55ae35806baf6bef3436df2afca76c6454b2a.tar.bz2 portage-79a55ae35806baf6bef3436df2afca76c6454b2a.zip |
Remove portage.usedefaults since it's broken by the previous commit.
-rw-r--r-- | pym/portage/__init__.py | 2 | ||||
-rw-r--r-- | pym/portage/_legacy_globals.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b2cbc0f0e..d16ca3a15 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -575,7 +575,7 @@ class _LegacyGlobalProxy(proxy.objectproxy.ObjectProxy): _legacy_global_var_names = ("archlist", "db", "features", "groups", "mtimedb", "mtimedbfile", "pkglines", "portdb", "profiledir", "root", "selinux_enabled", - "settings", "thirdpartymirrors", "usedefaults") + "settings", "thirdpartymirrors") for k in _legacy_global_var_names: globals()[k] = _LegacyGlobalProxy(k) diff --git a/pym/portage/_legacy_globals.py b/pym/portage/_legacy_globals.py index bdeba351d..69484a96b 100644 --- a/pym/portage/_legacy_globals.py +++ b/pym/portage/_legacy_globals.py @@ -72,9 +72,6 @@ def _get_legacy_global(name): portage.thirdpartymirrors = settings.thirdpartymirrors() constructed.add('thirdpartymirrors') - portage.usedefaults = settings.use_defs - constructed.add('usedefaults') - profiledir = os.path.join(settings["PORTAGE_CONFIGROOT"], PROFILE_PATH) if not os.path.isdir(profiledir): profiledir = None |