[elbe-devel] [PATCH v3 48/52] Fix style in pkgarchive.py
Torben Hohn
torben.hohn at linutronix.de
Fri Jul 5 13:30:31 CEST 2019
On Thu, Jun 27, 2019 at 02:45:02PM +0200, dion at linutronix.de wrote:
> From: Olivier Dion <dion at linutronix.de>
>
> Signed-off-by: Olivier Dion <dion at linutronix.de>
Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>
> ---
> elbepack/pkgarchive.py | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/elbepack/pkgarchive.py b/elbepack/pkgarchive.py
> index e335b8e2..5f796b5f 100644
> --- a/elbepack/pkgarchive.py
> +++ b/elbepack/pkgarchive.py
> @@ -59,7 +59,8 @@ def gen_binpkg_archive(ep, repodir):
>
> if not path.isfile(abs_path):
> # Package file does not exist, download it and adjust path name
> - logging.warning('Package file "%s" not found in var/cache/apt/archives, downloading it' % filename)
> + logging.warning('Package file "%s" not found in var/cache/apt/archives, downloading it',
> + filename)
> abs_path = ep.buildenv.rfs.fname(rel_path)
> pkg_id = "%s-%s" % (pkg.name, pkg.installed_version)
> try:
> @@ -67,13 +68,13 @@ def gen_binpkg_archive(ep, repodir):
> '/var/cache/elbe/pkgarchive',
> pkg.installed_version)
> except ValueError:
> - logging.error('No package "%s"' % pkg_id)
> + logging.error('No package "%s"', pkg_id)
> raise
> except FetchError:
> - logging.error('Package "%s" could not be downloaded' % pkd_id)
> + logging.error('Package "%s" could not be downloaded', pkg_id)
> raise
> except TypeError:
> - logging.error('Package "%s" missing name or version' % pkd_id)
> + logging.error('Package "%s" missing name or version', pkg_id)
> raise
>
> # Add package to repository
> @@ -141,14 +142,14 @@ def checkout_binpkg_archive(ep, repodir):
> for fpi in fpl:
> if p.name == fpi.et.text:
> version = fpi.et.get('version')
> - logging.info('Install "%s-%s"' % (p.name, version))
> + logging.info('Install "%s-%s"', p.name, version)
> c.mark_install(p.name, version,
> from_user=not fpi.et.get('auto'),
> nodeps=True)
> marked = True
>
> if not marked:
> - logging.info('Delete "%s-%s"' % (p.name, version))
> + logging.info('Delete "%s-%s"', p.name, version)
> c.mark_delete(p.name)
>
> # Now commit the changes
> --
> 2.11.0
>
>
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel
--
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99
Hinweise zum Datenschutz finden Sie hier (Informations on data privacy
can be found here): https://linutronix.de/kontakt/Datenschutz.php
Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen |
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner
More information about the elbe-devel
mailing list