On 3/11/20 4:32 PM, Matt Turner wrote:
> On Tue, Mar 10, 2020 at 8:30 PM Zac Medico <zmed...@gentoo.org> wrote:
>>
>> On 3/6/20 10:11 PM, Matt Turner wrote:
>>> +def _deps_equal(deps_a, deps_b, eapi, uselist=None):
>>> + """Compare two dependency lists given a set of USE flags"""
>>> + if deps_a == deps_b: return True
>>> +
>>> + deps_a = use_reduce(deps_a, uselist=uselist, eapi=eapi,
>>> token_class=Atom)
>>> + deps_b = use_reduce(deps_b, uselist=uselist, eapi=eapi,
>>> token_class=Atom)
>>
>> It's pure luck that passing a list of depstrings to use_reduce works
>> here, so it will be more future-proof to use ' '.join(depstr) instead.
>> The relevant code in use_reduce looks like this:
>>
>> if isinstance(depstr, list):
>> if portage._internal_caller:
>> warnings.warn(_("Passing paren_reduced dep arrays to %s is
>> deprecated. " + \
>> "Pass the original dep string instead.") % \
>> ('portage.dep.use_reduce',), DeprecationWarning,
>> stacklevel=2)
>> depstr = paren_enclose(depstr)
>
> Okay, thank you. I've fixed this with:
>
> - binpkg_deps = bin_dbapi.aux_get(cpv, keys)
> - ebuild_deps = port_dbapi.aux_get(cpv, keys)
> + binpkg_deps = ' '.join(bin_dbapi.aux_get(cpv, keys))
> + ebuild_deps = ' '.join(port_dbapi.aux_get(cpv, keys))
>
> With that fixed, do the patches look good to you?Yeah, looks good (with options['changed-deps'] logic fix from my other email). -- Thanks, Zac
signature.asc
Description: OpenPGP digital signature
