1 |
commit: 2083dae3fc52e2387d1c137c8aa203d083f13fc9 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 27 03:59:46 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 27 03:59:46 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2083dae3 |
7 |
|
8 |
Use Package.repo where appropriate. |
9 |
|
10 |
--- |
11 |
pym/_emerge/FakeVartree.py | 8 +++----- |
12 |
pym/_emerge/resolver/output.py | 8 +++----- |
13 |
pym/portage/tests/resolver/ResolverPlayground.py | 4 ++-- |
14 |
3 files changed, 8 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py |
17 |
index 398cde8..a0a506e 100644 |
18 |
--- a/pym/_emerge/FakeVartree.py |
19 |
+++ b/pym/_emerge/FakeVartree.py |
20 |
@@ -12,8 +12,7 @@ from portage.const import VDB_PATH |
21 |
from portage.dbapi.vartree import vartree |
22 |
from portage.dep._slot_operator import find_built_slot_operator_atoms |
23 |
from portage.eapi import _get_eapi_attrs |
24 |
-from portage.exception import InvalidDependString |
25 |
-from portage.repository.config import _gen_valid_repo |
26 |
+from portage.exception import InvalidData, InvalidDependString |
27 |
from portage.update import grab_updates, parse_updates, update_dbentries |
28 |
from portage.versions import _pkg_str |
29 |
|
30 |
@@ -111,7 +110,6 @@ class FakeVartree(vartree): |
31 |
# a KeyError to the caller if appropriate. |
32 |
pkg_obj = self.dbapi._cpv_map[pkg] |
33 |
installed_eapi = pkg_obj.eapi |
34 |
- repo = pkg_obj.metadata['repository'] |
35 |
eapi_attrs = _get_eapi_attrs(installed_eapi) |
36 |
built_slot_operator_atoms = None |
37 |
|
38 |
@@ -123,9 +121,9 @@ class FakeVartree(vartree): |
39 |
|
40 |
try: |
41 |
# Use the live ebuild metadata if possible. |
42 |
- repo = _gen_valid_repo(repo) |
43 |
live_metadata = dict(zip(self._portdb_keys, |
44 |
- self._portdb.aux_get(pkg, self._portdb_keys, myrepo=repo))) |
45 |
+ self._portdb.aux_get(pkg, self._portdb_keys, |
46 |
+ myrepo=pkg_obj.repo))) |
47 |
# Use the metadata from the installed instance if the EAPI |
48 |
# of either instance is unsupported, since if the installed |
49 |
# instance has an unsupported or corrupt EAPI then we don't |
50 |
|
51 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
52 |
index 85e1dd7..cfacab1 100644 |
53 |
--- a/pym/_emerge/resolver/output.py |
54 |
+++ b/pym/_emerge/resolver/output.py |
55 |
@@ -340,10 +340,9 @@ class Display(object): |
56 |
if self.quiet_repo_display: |
57 |
# overlay verbose |
58 |
# assign index for a previous version in the same slot |
59 |
- slot_matches = self.vardb.match(pkg.slot_atom) |
60 |
+ slot_matches = self.vardb.match_pkgs(pkg.slot_atom) |
61 |
if slot_matches: |
62 |
- repo_name_prev = self.vardb.aux_get(slot_matches[0], |
63 |
- ["repository"])[0] |
64 |
+ repo_name_prev = slot_matches[0].repo |
65 |
else: |
66 |
repo_name_prev = None |
67 |
|
68 |
@@ -649,8 +648,7 @@ class Display(object): |
69 |
pkg_info.repo_path_real = os.path.dirname(os.path.dirname( |
70 |
os.path.dirname(pkg_info.ebuild_path))) |
71 |
else: |
72 |
- pkg_info.repo_path_real = \ |
73 |
- self.portdb.getRepositoryPath(pkg.metadata["repository"]) |
74 |
+ pkg_info.repo_path_real = self.portdb.getRepositoryPath(pkg.repo) |
75 |
pkg_info.use = list(self.conf.pkg_use_enabled(pkg)) |
76 |
if not pkg.built and pkg.operation == 'merge' and \ |
77 |
'fetch' in pkg.metadata.restrict: |
78 |
|
79 |
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py |
80 |
index f81e046..cd09442 100644 |
81 |
--- a/pym/portage/tests/resolver/ResolverPlayground.py |
82 |
+++ b/pym/portage/tests/resolver/ResolverPlayground.py |
83 |
@@ -716,8 +716,8 @@ class ResolverPlaygroundResult(object): |
84 |
self.mergelist.append(x.atom) |
85 |
else: |
86 |
repo_str = "" |
87 |
- if x.metadata["repository"] != "test_repo": |
88 |
- repo_str = _repo_separator + x.metadata["repository"] |
89 |
+ if x.repo != "test_repo": |
90 |
+ repo_str = _repo_separator + x.repo |
91 |
mergelist_str = x.cpv + repo_str |
92 |
if x.built: |
93 |
if x.operation == "merge": |