| 1 |
commit: a02c5e35cd8ad43004776ea69b2fb62806966d2a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 31 15:41:52 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 31 15:41:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a02c5e35 |
| 7 |
|
| 8 |
Display: fix fetch restrict msg for RO_DISTDIRS |
| 9 |
|
| 10 |
This will fix bug #361463. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/resolver/output.py | 4 ++-- |
| 14 |
pym/portage/dbapi/porttree.py | 3 +++ |
| 15 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
| 18 |
index d573b5d..6c3579f 100644 |
| 19 |
--- a/pym/_emerge/resolver/output.py |
| 20 |
+++ b/pym/_emerge/resolver/output.py |
| 21 |
@@ -644,8 +644,8 @@ class Display(object): |
| 22 |
pkg_info.fetch_symbol = red("F") |
| 23 |
if pkg_info.ordered: |
| 24 |
self.counters.restrict_fetch += 1 |
| 25 |
- if self.portdb.fetch_check(pkg.cpv, pkg_info.use, |
| 26 |
- myrepo=pkg.repo): |
| 27 |
+ if not self.portdb.getfetchsizes(pkg.cpv, |
| 28 |
+ useflags=pkg_info.use, myrepo=pkg.repo): |
| 29 |
pkg_info.fetch_symbol = green("f") |
| 30 |
if pkg_info.ordered: |
| 31 |
self.counters.restrict_fetch_satisfied += 1 |
| 32 |
|
| 33 |
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py |
| 34 |
index bcf64dc..cd74d21 100644 |
| 35 |
--- a/pym/portage/dbapi/porttree.py |
| 36 |
+++ b/pym/portage/dbapi/porttree.py |
| 37 |
@@ -615,6 +615,9 @@ class portdbapi(dbapi): |
| 38 |
return filesdict |
| 39 |
|
| 40 |
def fetch_check(self, mypkg, useflags=None, mysettings=None, all=False, myrepo=None): |
| 41 |
+ """ |
| 42 |
+ TODO: account for PORTAGE_RO_DISTDIRS |
| 43 |
+ """ |
| 44 |
if all: |
| 45 |
useflags = None |
| 46 |
elif useflags is None: |
Archives