Re: [gentoo-portage-dev] [PATCH] portage config cleanup bits

[Alec Warner]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

*bump*

Alec Warner wrote:
> config has two sets of environment + use stuff.
>
> one is called configlist, the other configdict.  They are essentially
> copies of each other, and since for me dicts with named keys are easier,
> plus the old code was written crappily and is hard for me to follow,
> nuked that also.
>
> Also nuked config.backupenv, since it's in configdict anyway.
>
> Please test this, it works here, want to make sure there are no kinks,
> specifically with backupenv.

- ------------------------------------------------------------------------

- --- portage.py	2006-01-15 00:08:06.170717008 -0500
+++ -	2006-01-15 00:22:00.597106000 -0500
@@ -931,17 +931,8 @@
 			self.use_defs = copy.deepcopy(clone.use_defs)
 			self.usemask  = copy.deepcopy(clone.usemask)

- -			self.configlist = copy.deepcopy(clone.configlist)
- -			self.configlist[-1] = os.environ.copy()
- -			self.configdict = { "globals":   self.configlist[0],
- -			                    "defaults":  self.configlist[1],
- -			                    "conf":      self.configlist[2],
- -			                    "pkg":       self.configlist[3],
- -			                    "auto":      self.configlist[4],
- -			                    "backupenv": self.configlist[5],
- -			                    "env":       self.configlist[6] }
+			self.configdict = copy.deepcopy(clone.configdict)
 			self.profiles = copy.deepcopy(clone.profiles)
- -			self.backupenv  = copy.deepcopy(clone.backupenv)
 			self.pusedict   = copy.deepcopy(clone.pusedict)
 			self.categories = copy.deepcopy(clone.categories)
 			self.pkeywordsdict = copy.deepcopy(clone.pkeywordsdict)
@@ -980,11 +971,8 @@
 			}

 			self.usemask=[]
- -			self.configlist=[]
- -			self.backupenv={}
 			# back up our incremental variables:
 			self.configdict={}
- -			# configlist will contain: [ globals, defaults, conf, pkg, auto,
backupenv (incrementals), origenv ]

 			# The symlink might not exist or might not be a symlink.
 			try:
@@ -1043,8 +1031,7 @@
 				writemsg("!!! Incorrect multiline literals can cause this. Do not
use them.\n")
 				writemsg("!!! Errors in this file should be reported on
bugs.gentoo.org.\n")
 				sys.exit(1)
- -			self.configlist.append(self.mygcfg)
- -			self.configdict["globals"]=self.configlist[-1]
+			self.configdict["globals"] = self.mygcfg

 			self.mygcfg = {}
 			if self.profiles:
@@ -1062,8 +1049,7 @@
 					writemsg("!!! not then please report this to bugs.gentoo.org and,
if possible, a dev\n")
 					writemsg("!!! on #gentoo (irc.freenode.org)\n")
 					sys.exit(1)
- -			self.configlist.append(self.mygcfg)
- -			self.configdict["defaults"]=self.configlist[-1]
+			self.configdict["defaults"]=self.mygcfg

 			try:
 				# XXX: Should depend on root?
@@ -1078,28 +1064,32 @@
 				sys.exit(1)


- -			self.configlist.append(self.mygcfg)
- -			self.configdict["conf"]=self.configlist[-1]
+			self.configdict["conf"]=self.mygcfg

- -			self.configlist.append({})
- -			self.configdict["pkg"]=self.configlist[-1]
+			self.configdict["pkg"]={}

 			#auto-use:
- -			self.configlist.append({})
- -			self.configdict["auto"]=self.configlist[-1]
+			self.configdict["auto"]={}

 			#backup-env (for recording our calculated incremental variables:)
- -			self.backupenv = os.environ.copy()
- -			self.configlist.append(self.backupenv) # XXX Why though?
- -			self.configdict["backupenv"]=self.configlist[-1]
+			self.configdict["backupenv"]=os.environ.copy() # XXX Why though? (
ferringb? )

- -			self.configlist.append(os.environ.copy())
- -			self.configdict["env"]=self.configlist[-1]
+			### backupenv maybe required to be a clone, and not just a reference
+			### the old code did value copy we do a reference here
+			self.configdict["env"]=self.configdict["backupenv"]


 			# make lookuplist for loading package.*
- -			self.lookuplist=self.configlist[:]
- -			self.lookuplist.reverse()
+			# This may look like USE_ORDER, it has nothing to do with it.
+			# Instead this is the way that __getitem__ lookups are performed
+			# So env first, then backupenv, the auto, pkg, conf, defaults...etc.
+			self.lookuplist=[self.configdict["env"],
+					 self.configdict["backupenv"],
+					 self.configdict["auto"],
+					 self.configdict["pkg"],
+					 self.configdict["conf"],
+					 self.configdict["defaults"],
+					 self.configdict["globals"]]

 			if os.environ.get("PORTAGE_CALLER","") == "repoman":
 				# repoman shouldn't use local settings.
@@ -1197,8 +1187,14 @@
 				else:
 					self.pprovideddict[mycatpkg]=[x]

- -		self.lookuplist=self.configlist[:]
- -		self.lookuplist.reverse()
+		# make lookuplist for loading package.*
+		self.lookuplist=[self.configdict["env"],
+				 self.configdict["backupenv"],
+				 self.configdict["auto"],
+				 self.configdict["pkg"],
+				 self.configdict["conf"],
+				 self.configdict["defaults"],
+				 self.configdict["globals"]]

 		useorder=self["USE_ORDER"]
 		if not useorder:
@@ -1216,7 +1212,7 @@
 				self.uvlist[0:0]=[self.configdict[x]]

 		self.configdict["env"]["PORTAGE_GID"]=str(portage_gid)
- -		self.backupenv["PORTAGE_GID"]=str(portage_gid)
+		self.configdict["backupenv"]["PORTAGE_GID"]=str(portage_gid)

 		if self.has_key("PORT_LOGDIR") and not self["PORT_LOGDIR"]:
 			# port_logdir is defined, but empty.  this causes a traceback in
doebuild.
@@ -1301,17 +1297,17 @@

 	def backup_changes(self,key=None):
 		if key and self.configdict["env"].has_key(key):
- -			self.backupenv[key] = copy.deepcopy(self.configdict["env"][key])
+			self.configdict["backupenv"][key] =
copy.deepcopy(self.configdict["env"][key])
 		else:
 			raise KeyError, "No such key defined in environment: %s" % key

 	def reset(self,keeping_pkg=0,use_cache=1):
 		"reset environment to original settings"
- -		for x in self.configlist[-1].keys():
- -			if x not in self.backupenv.keys():
- -				del self.configlist[-1][x]
+		for x in self.configdict["env"].keys():
+			if x not in self.configdict["backupenv"].keys():
+				del self.configdict["env"][x]

- -		self.configdict["env"].update(self.backupenv)
+		self.configdict["env"].update(self.configdict["backupenv"])

 		self.modifiedkeys = []
 		if not keeping_pkg:
@@ -1409,7 +1405,8 @@
 				else:
 					self.configdict["auto"]["USE"]=""
 			else:
- -				mydbs=self.configlist[:-1]
+				#Abuse the order of lookuplist to emulate old behavior
+				mydbs=self.lookuplist[:-1]

 			myflags=[]
 			for curdb in mydbs:
@@ -1442,13 +1439,13 @@

 			myflags.sort()
 			#store setting in last element of configlist, the original environment:
- -			self.configlist[-1][mykey]=string.join(myflags," ")
+			self.configdict["env"][mykey]=string.join(myflags," ")
 			del myflags

 		#cache split-up USE var in a global
 		usesplit=[]

- -		for x in string.split(self.configlist[-1]["USE"]):
+		for x in string.split(self.configdict["env"]["USE"]):
 			if x not in self.usemask:
 				usesplit.append(x)

@@ -1466,7 +1463,7 @@
 				if self.configdict["defaults"]["ARCH"] not in usesplit:
 					usesplit.insert(0,self.configdict["defaults"]["ARCH"])

- -		self.configlist[-1]["USE"]=string.join(usesplit," ")
+		self.configdict["env"]["USE"]=string.join(usesplit," ")

 		self.already_in_regenerate = 0

@@ -1585,21 +1582,7 @@
 				match = x[mykey]
 				break

- -		if 0 and match and mykey in ["PORTAGE_BINHOST"]:
- -			# These require HTTP Encoding
- -			try:
- -				import urllib
- -				if urllib.unquote(match) != match:
- -					writemsg("Note: %s already contains escape codes." % (mykey))
- -				else:
- -					match = urllib.quote(match)
- -			except SystemExit, e:
- -				raise
- -			except:
- -				writemsg("Failed to fix %s using urllib, attempting to continue.\n"
 % (mykey))
- -				pass
- -
- -		elif mykey == "CONFIG_PROTECT_MASK":
+		if mykey == "CONFIG_PROTECT_MASK":
 			match += " /etc/env.d"

 		return match
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iQIVAwUBQ9jtO2zglR5RwbyYAQK0qA/9El45GCDx/0mt8G3vwfqz9yPbf3qUSQXd
Ve8SapcBRrp+8u2ve2FZbuxIkBer59QGY6k/bK2+Yr08fpo82p4wmbl0i1gtwcTB
yPrrAaGYoqf5mLiW8JvMDk9cI0A0jAVnswxnZwae+Rc4kDot9y2IeP+g7CqDZy/J
khiJPXBSJoky/+HP9uTKIs5LCNcepuhF9yEUXYE2rux/OB5izIzHrsJ1RhHxYiMT
SHtyiFp8TDYJiOr8V676WX9+H9iV1b9kc966QeMKEfIwfvqms6gTwGwYWlXK4QUS
19j/hzPU9N9xG9I3raLVZlP4i8vxgd4li8uNnCunIKMncON/6ZmMRB/gbVAxeH+D
6eVEf6yAaHT5V64/c8qNAO9xHWntq0eg9ZkEkUGryVVTmchklZyx0OgxF4TAb14o
ySFtedwVW++aU17mepuGjrG2nyZ8QX/n+egprd5e9as9kTUdprkiVntp4Skb2UI7
xCMWBi2DXh4HSft4NKlPvVRBhfmo0w5fsIIJtw/HDijIzOamPM6wePVPBSLrDYqQ
fzCHzw++eKXPVwMajozJdD7cJtjYu2BFnqplyP8z50R8g8oiV4WCpt8OfsrwVm7i
X6jNJyPruY2Xjq/z3sgKVJb4tLAN5h6y/ZX3J10TRbsSrTnqMzz+9XBv4y7/PbSm
A4IUOohQysE=
=IKnv
-----END PGP SIGNATURE-----
-- 
gentoo-portage-dev@g.o mailing list