diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-02 22:39:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-02 22:39:03 +0000 |
| commit | 4dc0fe373246e2b593f4ce8858bead44d6cc3434 (patch) | |
| tree | 7ce5d850b8d1a824144eca015daa83cd36ba44b6 | |
| parent | 7d52a8cba275e1f1dc5131283e2264db1724e10a (diff) | |
| download | portage-4dc0fe373246e2b593f4ce8858bead44d6cc3434.tar.gz portage-4dc0fe373246e2b593f4ce8858bead44d6cc3434.tar.bz2 portage-4dc0fe373246e2b593f4ce8858bead44d6cc3434.zip | |
Optimize varexpand for bug #149900.
svn path=/main/trunk/; revision=4574
| -rw-r--r-- | pym/portage_util.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage_util.py b/pym/portage_util.py index 83cdeda50..9d1bb84c2 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -286,10 +286,10 @@ def getconfig(mycfg,tolerant=0,allow_sourcing=False): #cache expansions of constant strings cexpand={} def varexpand(mystring,mydict={}): - try: - return cexpand[" "+mystring] - except KeyError: - pass + newstring = cexpand.get(" "+mystring, None) + if newstring is not None: + return newstring + """ new variable expansion code. Removes quotes, handles \n, etc. This code is used by the configfile code, as well as others (parser) |