[elbe-devel] [PATCH v2 16/28] Add logging to opt.output for command adjustpkgs

[Torben Hohn]

On Fri, Jun 21, 2019 at 07:40:08PM +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/commands/adjustpkgs.py | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/elbepack/commands/adjustpkgs.py b/elbepack/commands/adjustpkgs.py
> index f7dbdd0b..0cacb969 100644
> --- a/elbepack/commands/adjustpkgs.py
> +++ b/elbepack/commands/adjustpkgs.py
> @@ -6,25 +6,25 @@
>  
>  from __future__ import print_function
>  
> +import logging
> +import os
>  import sys
>  from optparse import OptionParser
>  
>  import apt
>  import apt.progress
>  
> -from elbepack.asciidoclog import ASCIIDocLog
>  from elbepack.treeutils import etree
> +from elbepack.log import elbe_logging
>  
>  
>  class adjpkg(object):
> -    def __init__(self, logfile, name):
> -
> -        self.outf = ASCIIDocLog(logfile)
> +    def __init__(self, name):
>  
>          if name:
> -            self.outf.h1("ELBE Report for Project " + name)
> +            logging.info("ELBE Report for Project " + name)
>          else:
> -            self.outf.h1("ELBE Report")
> +            logging.info("ELBE Report")
>  
>      def set_pkgs(self, pkglist):
>  
> @@ -51,7 +51,7 @@ class adjpkg(object):
>              for name in pkglist:
>  
>                  if name not in cache:
> -                    self.outf.printo("- package %s does not exist" % name)
> +                    logging.warning('Package "%s" does not exist' % name)
>                      errors += 1
>                      continue
>  
> @@ -114,8 +114,10 @@ def run_command(argv):
>          buildenv_pkgs = [p.et.text for p in xml.node(
>              "project/buildimage/pkg-list")]
>  
> -    adj = adjpkg(opt.output, opt.name)
> -    return adj.set_pkgs(xml_pkgs + mandatory_pkgs + buildenv_pkgs)
> +
> +    with elbe_logging(opt.output):
> +        adj = adjpkg(opt.name)
> +        return adj.set_pkgs(xml_pkgs + mandatory_pkgs + buildenv_pkgs)
>  
>  
>  if __name__ == "__main__":
> -- 
> 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