From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 20 Jul 2006 04:25:32 +0000 (-0000)
Subject: Remove redundant initialization of self.depcachedir for cloned config instances.
X-Git-Tag: v2.1.1~184
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f35d7c9dae03f99f8d3bcea6166dc18365f52c21;p=portage.git

Remove redundant initialization of self.depcachedir for cloned config instances.

svn path=/main/trunk/; revision=3957
---

diff --git a/pym/portage.py b/pym/portage.py
index c41dfbd60..9977cdfc6 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1195,6 +1195,11 @@ class config:
 			self["PORTAGE_GID"] = str(portage_gid)
 			self.backup_changes("PORTAGE_GID")
 
+			if self.get("PORTAGE_DEPCACHEDIR", None):
+				self.depcachedir = self["PORTAGE_DEPCACHEDIR"]
+				while "PORTAGE_DEPCACHEDIR" in self:
+					del self["PORTAGE_DEPCACHEDIR"]
+
 		self.lookuplist=self.configlist[:]
 		self.lookuplist.reverse()
 
@@ -1206,19 +1211,6 @@ class config:
 				#prepend db to list to get correct order
 				self.uvlist[0:0]=[self.configdict[x]]
 
-		if self["PORTAGE_CACHEDIR"]:
-			# XXX: Deprecated -- April 15 -- NJ
-			writemsg(yellow(">>> PORTAGE_CACHEDIR has been deprecated!")+"\n")
-			writemsg(">>> Please use PORTAGE_DEPCACHEDIR instead.\n")
-			self.depcachedir = self["PORTAGE_CACHEDIR"]
-			del self["PORTAGE_CACHEDIR"]
-
-		if self["PORTAGE_DEPCACHEDIR"]:
-			#the auxcache is the only /var/cache/edb/ entry that stays at / even when "root" changes.
-			# XXX: Could move with a CHROOT functionality addition.
-			self.depcachedir = self["PORTAGE_DEPCACHEDIR"]
-			del self["PORTAGE_DEPCACHEDIR"]
-
 		overlays = string.split(self["PORTDIR_OVERLAY"])
 		if overlays:
 			new_ov=[]