]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
manifest: change ".packages" suffix to ".changelog"
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 9 Sep 2021 10:39:08 +0000 (12:39 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 12 Oct 2021 08:20:34 +0000 (10:20 +0200)
".packages" was inspired by kiwi, where the original idea came from. But the
format is different anyway, and I'm constantly confused by the format name and
suffix being different, even though I wrote the feature. Let's just make them
the same.

mkosi/__init__.py
mkosi/backend.py

index 477cb537a7992f253b64944963bb5782b8b69a18..5102fed1dc780e6462e7b7f9be5331a64ae007ac 100644 (file)
@@ -4468,7 +4468,7 @@ def save_manifest(args: CommandLineArguments, manifest: Manifest) -> None:
                     _link_output(args, f.name, f"{args.output}.manifest")
 
         if ManifestFormat.changelog in args.manifest_format:
-            with complete_step(f"Saving report {relpath}.packages"):
+            with complete_step(f"Saving report {relpath}.changelog"):
                 g: TextIO = cast(
                     TextIO,
                     tempfile.NamedTemporaryFile(
@@ -4480,7 +4480,7 @@ def save_manifest(args: CommandLineArguments, manifest: Manifest) -> None:
                 )
                 with g:
                     manifest.write_package_report(g)
-                    _link_output(args, g.name, f"{relpath}.packages")
+                    _link_output(args, g.name, f"{relpath}.changelog")
 
 
 def print_output_size(args: CommandLineArguments) -> None:
@@ -5625,7 +5625,7 @@ def unlink_output(args: CommandLineArguments) -> None:
         with complete_step("Removing output files…"):
             unlink_try_hard(args.output)
             unlink_try_hard(f"{args.output}.manifest")
-            unlink_try_hard(f"{args.output}.packages")
+            unlink_try_hard(f"{args.output}.changelog")
 
             if args.checksum:
                 unlink_try_hard(args.output_checksum)
index 1c3dce6d3b3a61db02695093b386ab5798f14fa0..1fb1239d5a699981acc9e9f7e4313fa82377dad1 100644 (file)
@@ -215,7 +215,7 @@ class OutputFormat(Parseable, enum.Enum):
 
 
 class ManifestFormat(Parseable, enum.Enum):
-    json = "json"  # the standard manifest in json format
+    json      = "json"       # the standard manifest in json format
     changelog = "changelog"  # human-readable text file with package changelogs