diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-06 03:28:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-06 03:28:25 +0000 |
| commit | fb1a654e2ef880342a610ce1d4a2bfc87a2f737d (patch) | |
| tree | 05ddef780bf143900b84bef6f9df27de3678ff66 /pym/portage_util.py | |
| parent | e7c30c40488ed373109dfdabd316d87d92b33655 (diff) | |
| download | portage-fb1a654e2ef880342a610ce1d4a2bfc87a2f737d.tar.gz portage-fb1a654e2ef880342a610ce1d4a2bfc87a2f737d.tar.bz2 portage-fb1a654e2ef880342a610ce1d4a2bfc87a2f737d.zip | |
Don't call varexpand inside getconfig for env.d/profile.env values.
svn path=/main/trunk/; revision=4603
Diffstat (limited to 'pym/portage_util.py')
| -rw-r--r-- | pym/portage_util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage_util.py b/pym/portage_util.py index 52cbaa34c..f64169a9c 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -226,7 +226,7 @@ def writedict(mydict,myfilename,writekey=True): return 0 return 1 -def getconfig(mycfg,tolerant=0,allow_sourcing=False): +def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True): mykeys={} try: f=open(mycfg,'r') @@ -276,7 +276,10 @@ def getconfig(mycfg,tolerant=0,allow_sourcing=False): raise portage_exception.CorruptionError("ParseError: Unexpected EOF: "+str(mycfg)+": line "+str(lex.lineno)) else: return mykeys - mykeys[key]=varexpand(val,mykeys) + if expand: + mykeys[key] = varexpand(val, mykeys) + else: + mykeys[key] = val except SystemExit, e: raise except Exception, e: |