From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Jul 2007 18:20:58 +0000 (-0000)
Subject: For bug #184604, make env-update write $ in front of quoted values when appropriate.
X-Git-Tag: v2.2_pre1~1048
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=178a0f08155ba34e1050f78b6bf6aaac37bfb9b9;p=portage.git

For bug #184604, make env-update write $ in front of quoted values when appropriate.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 8de8457b6..b91f64086 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -705,8 +705,12 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
 
 	env_keys = [ x for x in env if x != "LDPATH" ]
 	env_keys.sort()
-	for x in env_keys:
-		outfile.write("export %s='%s'\n" % (x, env[x]))
+	for k in env_keys:
+		v = env[k]
+		if v.startswith('$') and not v.startswith('${'):
+			outfile.write("export %s=$'%s'\n" % (k, v[1:]))
+		else:
+			outfile.write("export %s='%s'\n" % (k, v))
 	outfile.close()
 
 	#create /etc/csh.env for (t)csh support