[elbe-devel] [PATCH 6/6] init: use new logging framework and cleanup linelength
Torben Hohn
torben.hohn at linutronix.de
Tue Oct 1 21:12:20 CEST 2019
Use the new_logging framework, and wrap all code after options
parsing with "with elbe_logging({"files": None}):". Then replace
all print() with logging.error() and fixup line lengths.
Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
elbepack/commands/init.py | 307 ++++++++++++++++++++------------------
1 file changed, 158 insertions(+), 149 deletions(-)
diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
index 3b0c32d45..c29dbf313 100644
--- a/elbepack/commands/init.py
+++ b/elbepack/commands/init.py
@@ -10,6 +10,7 @@ from __future__ import print_function
import os
import sys
import shutil
+import logging
from optparse import OptionParser
@@ -22,6 +23,7 @@ from elbepack.templates import write_template, get_initvm_preseed
from elbepack.directories import init_template_dir, elbe_dir
from elbepack.config import cfg
from elbepack.shellhelper import command_out, system, do
+from elbepack.log import elbe_logging
def run_command(argv):
@@ -99,163 +101,170 @@ def run_command(argv):
oparser.print_help()
sys.exit(20)
- if opt.devel:
- if not os.path.isdir(os.path.join(elbe_dir, "elbepack")):
- print("Devel Mode only valid, when running from elbe checkout")
+ with elbe_logging({"files": None}):
+ if opt.devel:
+ if not os.path.isdir(os.path.join(elbe_dir, "elbepack")):
+ logging.error("Devel Mode only valid, "
+ "when running from elbe checkout")
+ sys.exit(20)
+
+ if not opt.skip_validation:
+ validation = validate_xml(args[0])
+ if validation:
+ logging.error("xml validation failed. Bailing out")
+ for i in validation:
+ logging.error(i)
+ sys.exit(20)
+
+ xml = etree(args[0])
+
+ if not xml.has("initvm"):
+ logging.error("fatal error: "
+ "xml missing mandatory section 'initvm'")
sys.exit(20)
- if not opt.skip_validation:
- validation = validate_xml(args[0])
- if validation:
- print("xml validation failed. Bailing out")
- for i in validation:
- print(i)
+ if opt.buildtype:
+ buildtype = opt.buildtype
+ elif xml.has("initvm/buildtype"):
+ buildtype = xml.text("/initvm/buildtype")
+ else:
+ buildtype = "nodefaults"
+
+ defs = ElbeDefaults(buildtype)
+
+ http_proxy = ""
+ if os.getenv("http_proxy"):
+ http_proxy = os.getenv("http_proxy")
+ elif opt.proxy:
+ http_proxy = opt.proxy
+ elif xml.has("initvm/mirror/primary_proxy"):
+ http_proxy = xml.text("initvm/mirror/primary_proxy")
+ http_proxy = http_proxy.strip().replace("LOCALMACHINE",
+ "localhost")
+
+ if opt.cdrom:
+ mirror = xml.node("initvm/mirror")
+ mirror.clear()
+ cdrom = mirror.ensure_child("cdrom")
+ cdrom.set_text(os.path.abspath(opt.cdrom))
+
+ # this is a workaround for
+ # http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html
+ _, virt = command_out('test -x /usr/bin/systemd-detect-virt && '
+ '/usr/bin/systemd-detect-virt')
+ _, dist = command_out('lsb_release -cs')
+
+ if 'vmware' in virt and 'stretch' in dist:
+ machine_type = 'pc-i440fx-2.6'
+ else:
+ machine_type = 'pc'
+
+ try:
+ os.makedirs(opt.directory)
+ except OSError as e:
+ logging.error("unable to create project directory: %s (%s)",
+ opt.directory,
+ e.strerror)
+ sys.exit(30)
+
+ out_path = os.path.join(opt.directory, ".elbe-in")
+ try:
+ os.makedirs(out_path)
+ except OSError as e:
+ logging.error("unable to create subdirectory: %s (%s)",
+ out_path,
+ e.strerror)
+ sys.exit(30)
+
+ initvm_http_proxy = http_proxy.replace('http://localhost:',
+ 'http://10.0.2.2:')
+ d = {"elbe_version": elbe_version,
+ "defs": defs,
+ "opt": opt,
+ "xml": xml,
+ "prj": xml.node("/initvm"),
+ "http_proxy": initvm_http_proxy,
+ "pkgs": xml.node("/initvm/pkg-list") or [],
+ "preseed": get_initvm_preseed(xml),
+ "machine_type": machine_type,
+ "cfg": cfg}
+
+ if http_proxy != "":
+ os.putenv("http_proxy", http_proxy)
+ os.putenv("https_proxy", http_proxy)
+ os.putenv("no_proxy", "localhost,127.0.0.1")
+
+ try:
+ copy_kinitrd(xml.node("/initvm"), out_path)
+ except NoKinitrdException as e:
+ logging.error("Failure to download kernel/initrd debian Package:")
+ logging.error("")
+ logging.error(e.message)
+ logging.error("")
+ logging.error("Check Mirror configuration")
+ if 'SHA256SUMS' in e.message:
+ logging.error("If you use debmirror please read "
+ "https://github.com/Linutronix/elbe/issues/188 "
+ "on how to work around the issue")
sys.exit(20)
- xml = etree(args[0])
+ templates = os.listdir(init_template_dir)
- if not xml.has("initvm"):
- print("fatal error: xml missing mandatory section 'initvm'")
- sys.exit(20)
+ make_executable = ["init-elbe.sh.mako",
+ "preseed.cfg.mako"]
- if opt.buildtype:
- buildtype = opt.buildtype
- elif xml.has("initvm/buildtype"):
- buildtype = xml.text("/initvm/buildtype")
- else:
- buildtype = "nodefaults"
-
- defs = ElbeDefaults(buildtype)
-
- http_proxy = ""
- if os.getenv("http_proxy"):
- http_proxy = os.getenv("http_proxy")
- elif opt.proxy:
- http_proxy = opt.proxy
- elif xml.has("initvm/mirror/primary_proxy"):
- http_proxy = xml.text("initvm/mirror/primary_proxy")
- http_proxy = http_proxy.strip().replace("LOCALMACHINE", "localhost")
-
- if opt.cdrom:
- mirror = xml.node("initvm/mirror")
- mirror.clear()
- cdrom = mirror.ensure_child("cdrom")
- cdrom.set_text(os.path.abspath(opt.cdrom))
-
- # this is a workaround for
- # http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html
- _, virt = command_out('test -x /usr/bin/systemd-detect-virt && /usr/bin/systemd-detect-virt');
- _, dist = command_out('lsb_release -cs')
-
- if 'vmware' in virt and 'stretch' in dist:
- machine_type = 'pc-i440fx-2.6'
- else:
- machine_type = 'pc'
-
- try:
- os.makedirs(opt.directory)
- except OSError as e:
- print(
- "unable to create project directory: %s (%s)" %
- (opt.directory, e.strerror))
- sys.exit(30)
-
- out_path = os.path.join(opt.directory, ".elbe-in")
- try:
- os.makedirs(out_path)
- except OSError as e:
- print(
- "unable to create subdirectory: %s (%s)" %
- (out_path, e.strerror))
- sys.exit(30)
-
- initvm_http_proxy = http_proxy.replace('http://localhost:',
- 'http://10.0.2.2:')
- d = {"elbe_version": elbe_version,
- "defs": defs,
- "opt": opt,
- "xml": xml,
- "prj": xml.node("/initvm"),
- "http_proxy": initvm_http_proxy,
- "pkgs": xml.node("/initvm/pkg-list") or [],
- "preseed": get_initvm_preseed(xml),
- "machine_type": machine_type,
- "cfg": cfg}
-
- if http_proxy != "":
- os.putenv("http_proxy", http_proxy)
- os.putenv("https_proxy", http_proxy)
- os.putenv("no_proxy", "localhost,127.0.0.1")
-
- try:
- copy_kinitrd(xml.node("/initvm"), out_path)
- except NoKinitrdException as e:
- print("Failure to download kernel/initrd debian Package:")
- print("")
- print(e.message)
- print("")
- print("Check Mirror configuration")
- if 'SHA256SUMS' in e.message:
- print("If you use debmirror please read https://github.com/Linutronix/elbe/issues/188 "
- "on how to work around the issue")
- sys.exit(20)
+ for t in templates:
+ o = t.replace(".mako", "")
- templates = os.listdir(init_template_dir)
+ if t == "Makefile.mako" or t == "libvirt.xml.mako":
+ write_template(
+ os.path.join(
+ opt.directory, o), os.path.join(
+ init_template_dir, t), d, linebreak=True)
+ else:
+ write_template(
+ os.path.join(
+ out_path, o), os.path.join(
+ init_template_dir, t), d, linebreak=False)
- make_executable = ["init-elbe.sh.mako",
- "preseed.cfg.mako"]
+ if t in make_executable:
+ os.chmod(os.path.join(out_path, o), 0o755)
- for t in templates:
- o = t.replace(".mako", "")
+ shutil.copyfile(args[0],
+ os.path.join(out_path, "source.xml"))
- if t == "Makefile.mako" or t == "libvirt.xml.mako":
- write_template(
- os.path.join(
- opt.directory, o), os.path.join(
- init_template_dir, t), d, linebreak=True)
+ if opt.cdrom:
+ system('7z x -o%s "%s" elbe-keyring.gpg' % (out_path, opt.cdrom))
else:
- write_template(
- os.path.join(
- out_path, o), os.path.join(
- init_template_dir, t), d, linebreak=False)
-
- if t in make_executable:
- os.chmod(os.path.join(out_path, o), 0o755)
-
- shutil.copyfile(args[0],
- os.path.join(out_path, "source.xml"))
-
- if opt.cdrom:
- system('7z x -o%s "%s" elbe-keyring.gpg' % (out_path, opt.cdrom))
- else:
- keys = []
- for key in xml.all(".//initvm/mirror/url-list/url/raw-key"):
- keys.append(key.et.text)
-
- import_keyring = os.path.join(out_path, "elbe-keyring")
-
- do('gpg --no-options \
- --no-default-keyring \
- --keyring %s --import' % import_keyring,
- stdin="".join(keys),
- allow_fail=True,
- env_add={'GNUPGHOME': out_path})
-
- export_keyring = import_keyring + ".gpg"
-
- do('gpg --no-options \
- --no-default-keyring \
- --keyring %s \
- --export \
- --output %s' % (import_keyring, export_keyring))
-
- if opt.devel:
- out_real = os.path.realpath(out_path)
- ignore = ''
- if out_real.startswith(elbe_dir + os.sep):
- ignore = '--exclude "%s"' % os.path.relpath(out_path,
- start=elbe_dir)
-
- system('tar cfj "%s" %s -C "%s" .' % (os.path.join(out_path, "elbe-devel.tar.bz2"),
- ignore,
- elbe_dir))
+ keys = []
+ for key in xml.all(".//initvm/mirror/url-list/url/raw-key"):
+ keys.append(key.et.text)
+
+ import_keyring = os.path.join(out_path, "elbe-keyring")
+
+ do('gpg --no-options \
+ --no-default-keyring \
+ --keyring %s --import' % import_keyring,
+ stdin="".join(keys),
+ allow_fail=True,
+ env_add={'GNUPGHOME': out_path})
+
+ export_keyring = import_keyring + ".gpg"
+
+ do('gpg --no-options \
+ --no-default-keyring \
+ --keyring %s \
+ --export \
+ --output %s' % (import_keyring, export_keyring))
+
+ if opt.devel:
+ out_real = os.path.realpath(out_path)
+ ignore = ''
+ if out_real.startswith(elbe_dir + os.sep):
+ ignore = '--exclude "%s"' % os.path.relpath(out_path,
+ start=elbe_dir)
+
+ tar_fname = os.path.join(out_path, "elbe-devel.tar.bz2")
+ system('tar cfj "%s" %s -C "%s" .' % (tar_fname,
+ ignore,
+ elbe_dir))
--
2.20.1
More information about the elbe-devel
mailing list