From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 3 Sep 2023 12:29:57 +0000 (+0200)
Subject: Use logging more
X-Git-Tag: v16~17^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77feccf16a82c740f557ad92b7288de3fc880d44;p=thirdparty%2Fmkosi.git

Use logging more
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 95d4f6c29..2f451e657 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2020,7 +2020,7 @@ def run_serve(config: MkosiConfig) -> None:
         os.chdir(config.output_dir)
 
     with http.server.HTTPServer(("", port), http.server.SimpleHTTPRequestHandler) as httpd:
-        print(f"Serving HTTP on port {port}: http://localhost:{port}/")
+        logging.info(f"Serving HTTP on port {port}: http://localhost:{port}/")
         httpd.serve_forever()
 
 
diff --git a/mkosi/manifest.py b/mkosi/manifest.py
index d288e4bb7..22d776111 100644
--- a/mkosi/manifest.py
+++ b/mkosi/manifest.py
@@ -3,6 +3,7 @@
 import dataclasses
 import datetime
 import json
+import logging
 import subprocess
 import textwrap
 from pathlib import Path
@@ -279,9 +280,9 @@ class Manifest:
         packages, and includes the changelogs. A diff between two such
         reports shows what changed *in* the packages quite nicely.
         """
-        print(f"Packages: {len(self.packages)}", file=out)
-        print(f"Size:     {sum(p.size for p in self.packages)}", file=out)
+        logging.info(f"Packages: {len(self.packages)}")
+        logging.info(f"Size:     {sum(p.size for p in self.packages)}")
 
         for package in self.source_packages.values():
-            print(f"\n{80*'-'}\n", file=out)
+            logging.info(f"\n{80*'-'}\n")
             out.write(package.report())
diff --git a/mkosi/util.py b/mkosi/util.py
index d3ac12208..11de8203a 100644
--- a/mkosi/util.py
+++ b/mkosi/util.py
@@ -15,7 +15,6 @@ import pwd
 import re
 import resource
 import stat
-import sys
 import tempfile
 from collections.abc import Iterable, Iterator, Mapping, Sequence
 from pathlib import Path
@@ -54,7 +53,7 @@ def read_os_release() -> Iterator[tuple[str, str]]:
                     val = ast.literal_eval(val)
                 yield name, val
             else:
-                print(f"{filename}:{line_number}: bad line {line!r}", file=sys.stderr)
+                logging.info(f"{filename}:{line_number}: bad line {line!r}")
 
 
 def format_rlimit(rlimit: int) -> str: