diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-27 12:24:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-27 12:24:24 +0000 |
| commit | 9b8f893ceeb765b77011b41113d8e6bb2c9192e6 (patch) | |
| tree | 94006381a9ec88038bc7f74a7cad9e3c9a6a92dc | |
| parent | 6afc2ce278026a71f9193bdde71beda40ebbeb36 (diff) | |
| download | portage-9b8f893ceeb765b77011b41113d8e6bb2c9192e6.tar.gz portage-9b8f893ceeb765b77011b41113d8e6bb2c9192e6.tar.bz2 portage-9b8f893ceeb765b77011b41113d8e6bb2c9192e6.zip | |
Fix breakage from r11213 in INHERITED values returned from portdbapi.aux_get().
svn path=/main/trunk/; revision=11217
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 7f4008432..2948ba6a4 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -432,15 +432,11 @@ class portdbapi(dbapi): mydata["repository"] = self._repository_map.get( os.path.sep.join(myebuild.split(os.path.sep)[:-3]), "") + mydata["INHERITED"] = ' '.join(mydata.get("_eclasses_", [])) + mydata["_mtime_"] = st.st_mtime + #finally, we look at our internal cache entry and return the requested data. - returnme = [] - for x in mylist: - if x == "INHERITED": - returnme.append(' '.join(mydata.get("_eclasses_", []))) - elif x == "_mtime_": - returnme.append(st.st_mtime) - else: - returnme.append(mydata.get(x,"")) + returnme = [mydata.get(x, "") for x in mylist] if cache_me: if self._aux_cache_slot_dict is None: |