[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/portage/dbapi/

[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/portage/dbapi/

[Zac Medico]

commit:     a02c5e35cd8ad43004776ea69b2fb62806966d2a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 15:41:52 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 15:41:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a02c5e35

Display: fix fetch restrict msg for RO_DISTDIRS

This will fix bug #361463.

---
 pym/_emerge/resolver/output.py |    4 ++--
 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 d573b5d..6c3579f 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 bcf64dc..cd74d21 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: