diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-31 08:41:52 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-31 08:41:52 -0700 |
| commit | a02c5e35cd8ad43004776ea69b2fb62806966d2a (patch) | |
| tree | 86ad3b9a09df336dee887abf39180fd13c3083c6 | |
| parent | 6f526bf9532b34434f2f5a6860901941ee86382c (diff) | |
| download | portage-a02c5e35cd8ad43004776ea69b2fb62806966d2a.tar.gz portage-a02c5e35cd8ad43004776ea69b2fb62806966d2a.tar.bz2 portage-a02c5e35cd8ad43004776ea69b2fb62806966d2a.zip | |
Display: fix fetch restrict msg for RO_DISTDIRS
This will fix bug #361463.
| -rw-r--r-- | pym/_emerge/resolver/output.py | 4 | ||||
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index d573b5d60..6c3579f73 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -644,8 +644,8 @@ class Display(object): pkg_info.fetch_symbol = red("F") if pkg_info.ordered: self.counters.restrict_fetch += 1 - if self.portdb.fetch_check(pkg.cpv, pkg_info.use, - myrepo=pkg.repo): + if not self.portdb.getfetchsizes(pkg.cpv, + useflags=pkg_info.use, myrepo=pkg.repo): pkg_info.fetch_symbol = green("f") if pkg_info.ordered: self.counters.restrict_fetch_satisfied += 1 diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index bcf64dc41..cd74d21df 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -615,6 +615,9 @@ class portdbapi(dbapi): return filesdict def fetch_check(self, mypkg, useflags=None, mysettings=None, all=False, myrepo=None): + """ + TODO: account for PORTAGE_RO_DISTDIRS + """ if all: useflags = None elif useflags is None: |