diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-23 01:56:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-23 01:56:34 +0000 |
| commit | c09294d1a057ee479c1900dd4e686bd8f8a43514 (patch) | |
| tree | f7e9d351436c395485c08a3e985e58ff9af2936a | |
| parent | 75e88d3698f899db7a593d55f9d9f27d08452542 (diff) | |
| download | portage-c09294d1a057ee479c1900dd4e686bd8f8a43514.tar.gz portage-c09294d1a057ee479c1900dd4e686bd8f8a43514.tar.bz2 portage-c09294d1a057ee479c1900dd4e686bd8f8a43514.zip | |
Combine two default EAPI settings in portdbapi.aux_get().
svn path=/main/trunk/; revision=5359
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pym/portage.py b/pym/portage.py index 34fb37f63..35cdbdc6a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5376,6 +5376,9 @@ class portdbapi(dbapi): self.auxdb[mylocation][mycpv] = mydata + if not mydata.setdefault("EAPI", "0"): + mydata["EAPI"] = "0" + #finally, we look at our internal cache entry and return the requested data. returnme = [] for x in mylist: @@ -5384,15 +5387,8 @@ class portdbapi(dbapi): else: returnme.append(mydata.get(x,"")) - if "EAPI" in mylist: - idx = mylist.index("EAPI") - if not returnme[idx]: - returnme[idx] = "0" - if cache_me: aux_cache = {} - if not mydata.setdefault("EAPI", "0"): - mydata["EAPI"] = "0" for x in self._aux_cache_keys: aux_cache[x] = mydata.get(x, "") self._aux_cache[mycpv] = aux_cache |