[elbe-devel] pylint merge

[Olivier Dion]

On Mon, 15 Jun 2020, Torben Hohn <torben.hohn at linutronix.de> wrote:
> Hi...
>
> i have tried to merge the pylint branch.
>
> Here is output from git show
> As you already stated, there are some errors.
>
>
> --------------------------------------------------------------------------------------------
> commit b93015c28fbcf945322651ddf8f3113a3a85f0b3
> Merge: e0d0d05b1 2d3c88a5b
> Author: Torben Hohn <torben.hohn at linutronix.de>
> Date:   Mon Jun 15 14:26:50 2020 +0200
>
>     Merge branch 'master' into devel/dion/pylint
>     
>     Due to the size of this Queue, its not rebased.
>     A merge commit can be reviewed easier.
>     
>     # By Olivier Dion
>     * master:
>       commands mkcdrom: Generate source list for building source cdrom
>       elbeproject: Generate source list for building source cdrom
>       cdroms: Change call to download_source
>       rpcaptcache: Make download_source better
>       rpcaptcache: Add get_corresponding_source_packages
>       commands init: Ignore files for elbe-devel.tar.bz2
>       initvmaction: Add sync action
>       initvmaction: Cleanup actions registration
>       filesystem: Add doctests
>       tests doctests: Add filesystem doctests
>       shellhelper: Fix get_command_out()
>       shellhelper: Add doctests
>       tests test_doctest: Add unittest for doctests
>       tests test_efilesystem: Add copyright
>       log: Fix async_logging()
>     
>     [torbenh: fix conflicts in
>               elbepack/cdroms.py
>               elbepack/elbeproject.py
>               elbepack/log.py
>               elbepack/rpcaptcache.py
>               elbepack/shellhelper.py]
>     
>     Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
>
> 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.

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