summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-26 09:33:56 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-26 09:33:56 +0000
commitc8ea8e24f884d4eda1639fec3b99aa16a826a36f (patch)
treeab39f73af5d6851d3ade9e026f4425378ee14334
parent6181fdcb4ad4dfc3d8b83c5fa2e88bac5f095f6f (diff)
downloadportage-c8ea8e24f884d4eda1639fec3b99aa16a826a36f.tar.gz
portage-c8ea8e24f884d4eda1639fec3b99aa16a826a36f.tar.bz2
portage-c8ea8e24f884d4eda1639fec3b99aa16a826a36f.zip
Group together and clearly mark some deprecated globals.
svn path=/main/trunk/; revision=3242
-rw-r--r--pym/portage.py30
1 files changed, 17 insertions, 13 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 1f4269086..a14e9fa5b 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6782,10 +6782,6 @@ def load_mtimedb(f):
# code that is aware of this flag to import portage without the unnecessary
# overhead (and other issues!) of initializing the legacy globals.
-profiledir = None # DEPRECATED (no longer used)
-if os.path.isdir(PROFILE_PATH):
- profiledir = PROFILE_PATH
-
db={}
# We're going to lock the global config to prevent changes, but we need
@@ -6830,9 +6826,6 @@ if 'selinux' in settings["USE"].split(" "):
else:
selinux_enabled=0
-def flushmtimedb(record):
- writemsg("portage.flushmtimedb() is DEPRECATED\n")
-
mtimedbfile = os.path.join(root, CACHE_PATH.lstrip(os.path.sep), "mtimedb")
try:
f = open(mtimedbfile)
@@ -6851,12 +6844,23 @@ if root!="/":
thirdpartymirrors = settings.thirdpartymirrors()
-# COMPATABILITY -- This shouldn't be used.
-pkglines = settings.packages
-
-groups = settings["ACCEPT_KEYWORDS"].split() # DEPRECATED (no longer used)
-archlist = settings.archlist() # DEPRECATED (no longer used)
-features = settings.features # DEPRECATED (no longer used)
+# ============================================================================
+# COMPATIBILITY
+# These attributes should not be used within Portage under any circumstances.
+# ============================================================================
+archlist = settings.archlist()
+features = settings.features
+groups = settings["ACCEPT_KEYWORDS"].split()
+pkglines = settings.packages
+profiledir = None
+if os.path.isdir(PROFILE_PATH):
+ profiledir = PROFILE_PATH
+def flushmtimedb(record):
+ writemsg("portage.flushmtimedb() is DEPRECATED\n")
+# ============================================================================
+# COMPATIBILITY
+# These attributes should not be used within Portage under any circumstances.
+# ============================================================================
# Clear the cache
dircache={}