diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-05-29 20:37:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-29 20:37:05 +0000 |
| commit | 77d02261fe700c9b719bde00a878965f0ba99b43 (patch) | |
| tree | 46211b3425d995f1ed2b660991ae8bb84097dbb9 | |
| parent | Fix dep_getcpv() so that it always properly removes the slot regardless of wh... (diff) | |
| download | portage-multirepo-77d02261fe700c9b719bde00a878965f0ba99b43.tar.gz portage-multirepo-77d02261fe700c9b719bde00a878965f0ba99b43.tar.bz2 portage-multirepo-77d02261fe700c9b719bde00a878965f0ba99b43.zip | |
Fix get_operator() and best_match_to_list() so that slot deps mesh properly with operators. (trunk r6663)
svn path=/main/branches/2.1.2/; revision=6664
| -rw-r--r-- | pym/portage_dep.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage_dep.py b/pym/portage_dep.py index de258660..ec590f20 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -266,6 +266,8 @@ def get_operator(mydep): @return: The operator. One of: '~', '=', '>', '<', '=*', '>=', or '<=' """ + if mydep: + mydep = remove_slot(mydep) if mydep[0] == "~": operator = "~" elif mydep[0] == "=": @@ -515,7 +517,6 @@ def best_match_to_list(mypkg, mylist): if maxvalue < 3: maxvalue = 3 bestm = x - continue op_val = operator_values[get_operator(x)] if op_val > maxvalue: maxvalue = op_val |