diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-29 20:36:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-29 20:36:40 +0000 |
| commit | 73d7834ad6d013e72f93df96305993e6c04cd81a (patch) | |
| tree | fd141f459c8a6bc351b13d95d8685116e2966472 /pym | |
| parent | 3948007beaa13f8d20160688d4cfddb2d453b4e1 (diff) | |
| download | portage-73d7834ad6d013e72f93df96305993e6c04cd81a.tar.gz portage-73d7834ad6d013e72f93df96305993e6c04cd81a.tar.bz2 portage-73d7834ad6d013e72f93df96305993e6c04cd81a.zip | |
Fix get_operator() and best_match_to_list() so that slot deps mesh properly with operators.
svn path=/main/trunk/; revision=6663
Diffstat (limited to 'pym')
| -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 134e53bde..1252b5d26 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -322,6 +322,8 @@ def get_operator(mydep): @return: The operator. One of: '~', '=', '>', '<', '=*', '>=', or '<=' """ + if mydep: + mydep = remove_slot(mydep) if mydep[0] == "~": operator = "~" elif mydep[0] == "=": @@ -601,7 +603,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 |