diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-05-13 13:21:55 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-13 13:21:55 -0700 |
| commit | af2d127f671280ac73e5a18a63bea8458c02ed94 (patch) | |
| tree | 470aa52258b230168c1ce6648d05f06c530cf9b9 /pym/portage/dep | |
| parent | cpvequal: use _pkg_str (diff) | |
| download | portage-af2d127f671280ac73e5a18a63bea8458c02ed94.tar.gz portage-af2d127f671280ac73e5a18a63bea8458c02ed94.tar.bz2 portage-af2d127f671280ac73e5a18a63bea8458c02ed94.zip | |
match_from_list: avoid multiple meanings of mycpv
Diffstat (limited to 'pym/portage/dep')
| -rw-r--r-- | pym/portage/dep/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 0c92857c4..4ccc6696b 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1990,7 +1990,7 @@ def match_from_list(mydep, candidate_list): myver = mysplit[2].lstrip("0") if not myver or not myver[0].isdigit(): myver = "0"+myver - mycpv = mysplit[0]+"/"+mysplit[1]+"-"+myver + mycpv_cmp = mysplit[0]+"/"+mysplit[1]+"-"+myver for x in candidate_list: xs = getattr(x, "cpv_split", None) if xs is None: @@ -1999,7 +1999,7 @@ def match_from_list(mydep, candidate_list): if not myver or not myver[0].isdigit(): myver = "0"+myver xcpv = xs[0]+"/"+xs[1]+"-"+myver - if xcpv.startswith(mycpv): + if xcpv.startswith(mycpv_cmp): mylist.append(x) elif operator == "~": # version, any revision, match |