1 |
commit: 92e5a5402074d4cb20c5cc9bd323acaf7a8e211e |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 5 08:59:49 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 5 08:59:49 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=92e5a540 |
7 |
|
8 |
portdbapi.xmatch: remove redundant myval check |
9 |
|
10 |
--- |
11 |
pym/portage/dbapi/porttree.py | 12 +++++------- |
12 |
1 files changed, 5 insertions(+), 7 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py |
15 |
index 4c02cbe..394a57c 100644 |
16 |
--- a/pym/portage/dbapi/porttree.py |
17 |
+++ b/pym/portage/dbapi/porttree.py |
18 |
@@ -813,13 +813,11 @@ class portdbapi(dbapi): |
19 |
# match *all* packages, only against the cpv, in order |
20 |
# to bypass unnecessary cache access for things like IUSE |
21 |
# and SLOT. |
22 |
- |
23 |
- if myval is None: |
24 |
- if mydep == mykey: |
25 |
- myval = self.cp_list(mykey, mytree=mytree) |
26 |
- else: |
27 |
- myval = match_from_list(mydep, |
28 |
- self.cp_list(mykey, mytree=mytree)) |
29 |
+ if mydep == mykey: |
30 |
+ myval = self.cp_list(mykey, mytree=mytree) |
31 |
+ else: |
32 |
+ myval = match_from_list(mydep, |
33 |
+ self.cp_list(mykey, mytree=mytree)) |
34 |
|
35 |
elif level == "list-visible": |
36 |
#a list of all visible packages, not called directly (just by xmatch()) |