[elbe-devel] pylint merge

Olivier Dion dion at linutronix.de
Mon Jun 15 14:44:25 CEST 2020


On Mon, 15 Jun 2020, Olivier Dion <dion at linutronix.de> wrote:
>> diff --cc elbepack/cdroms.py
>> index a13a0fba6,a09e05259..d3ce0975b
>> --- a/elbepack/cdroms.py
>> +++ b/elbepack/cdroms.py
>> @@@ -31,10 -30,8 +31,10 @@@ def add_source_pkg(repo, component, cac
>>           return
>>       pkg_id = "%s-%s" % (pkg, version)
>>       try:
>>  -        dsc = cache.download_source(pkg, version, '/var/cache/elbe/sources')
>>  +        dsc = cache.download_source(pkg,
>>  +                                    '/var/cache/elbe/sources',
>>  +                                    version=version)
>
> I changed this so that it's: (pkg-name, pkg-version, output).  Thus the
> correct version is the first one:
> ----------------------------------------------------------------------
> dsc = cache.download_source(pkg, version, '/var/cache/elbe/sources')
> ----------------------------------------------------------------------
>
>> -         repo.includedsc(dsc, components=component, force=True)
>> +         repo.includedsc(dsc, component=component, force=True)
>
> This is changed to components (with a 's') to reflect that there might
> be multiple one.
>

With these changes applied:

Reviewed-by: Olivier Dion <dion at linutronix.de>

-- 
Olivier Dion
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen



More information about the elbe-devel mailing list