From: Zac Medico Date: Tue, 10 Jul 2007 18:29:22 +0000 (-0000) Subject: For bug #184604, make env-update write $ in front of quoted values when appropriate... X-Git-Tag: v2.1.3~69 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e121bc5c499d8be0447d2a3f38cc7f5fd5891079;p=portage.git For bug #184604, make env-update write $ in front of quoted values when appropriate. (trunk r7216) svn path=/main/branches/2.1.2/; revision=7217 --- diff --git a/pym/portage.py b/pym/portage.py index 57d58e5b8..7127a1c7f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -811,8 +811,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