[elbe-devel] [PATCH v4 15/41] Add logging to opt.output for command hdimg

dion at linutronix.de dion at linutronix.de
Mon Jul 8 17:18:11 CEST 2019


From: Olivier Dion <dion at linutronix.de>

make use of the new logging system, and replace all print() with
functions from logging and wrap it in
"with elbe_logging({"files":opt.output}):"

Signed-off-by: Olivier Dion <dion at linutronix.de>
---
 elbepack/commands/hdimg.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/elbepack/commands/hdimg.py b/elbepack/commands/hdimg.py
index 85111b5c..ecb40189 100644
--- a/elbepack/commands/hdimg.py
+++ b/elbepack/commands/hdimg.py
@@ -8,11 +8,14 @@
 from __future__ import print_function
 
 import sys
+import os
+import logging
 
 from optparse import OptionParser
 
 from elbepack.elbeproject import ElbeProject
 from elbepack.elbexml import ValidationError
+from elbepack.log import elbe_logging
 
 
 def run_command(argv):
@@ -64,13 +67,14 @@ def run_command(argv):
         oparser.print_help()
         sys.exit(20)
 
-    try:
-        project = ElbeProject(opt.target, override_buildtype=opt.buildtype,
-                              xmlpath=args[0], logpath=opt.output,
-                              skip_validate=opt.skip_validation)
-    except ValidationError as e:
-        print(str(e))
-        print("xml validation failed. Bailing out")
-        sys.exit(20)
+    with elbe_logging({"files":opt.output}):
+        try:
+            project = ElbeProject(opt.target,
+                                  override_buildtype=opt.buildtype,
+                                  xmlpath=args[0], logpath=opt.output,
+                                  skip_validate=opt.skip_validation)
+        except ValidationError:
+            logging.exception("XML validation failed.  Bailing out")
+            sys.exit(20)
 
-    project.targetfs.part_target(opt.target, opt.grub_version)
+        project.targetfs.part_target(opt.target, opt.grub_version)
-- 
2.11.0




More information about the elbe-devel mailing list