New upstream version 1

1 files changed, 10 insertions, 3 deletions

diff --git a/mkosi b/mkosi
index ca06423..1c74c5f 100755
--- a/mkosi
+++ b/mkosi
@@ -16,6 +16,8 @@ import time
 import uuid
 from enum import Enum
 
+__version__ = '1'
+
 # TODO
 # - squashfs root
 # - volatile images
@@ -1180,7 +1182,7 @@ def process_setting(args, section, key, value):
                 args.read_only = parse_boolean(value)
         elif key == "Compress":
             if not args.compress:
-                args.read_only = parse_boolean(value)
+                args.compress = parse_boolean(value)
         elif key == "XZ":
             if not args.xz:
                 args.xz = parse_boolean(value)
@@ -1245,14 +1247,17 @@ def process_setting(args, section, key, value):
             return False
     elif section == "Validation":
         if key == "CheckSum":
-            if not args.check_sum:
-                args.check_sum = parse_boolean(value)
+            if not args.checksum:
+                args.checksum = parse_boolean(value)
         elif key == "Sign":
             if not args.sign:
                 args.sign = parse_boolean(value)
         elif key == "Key":
             if args.key is None:
                 args.key = value
+        elif key == "Password":
+            if args.password is None:
+                args.password = value
         elif key is None:
             return True
         else:
@@ -1501,6 +1506,7 @@ def print_summary(args):
 
     if args.distribution == Distribution.fedora:
         sys.stderr.write("    With Documentation: " + yes_no(args.with_docs) + "\n")
+    if args.distribution in (Distribution.fedora, Distribution.debian, Distribution.ubuntu):
         sys.stderr.write("         Package Cache: " + none_to_none(args.cache_path) + "\n")
 
     sys.stderr.write("           Extra Trees: " + line_join_list(args.extra_trees) + "\n")
@@ -1523,6 +1529,7 @@ def print_summary(args):
         sys.stderr.write("              Checksum: " + yes_no(args.checksum) + "\n")
         sys.stderr.write("                  Sign: " + yes_no(args.sign) + "\n")
         sys.stderr.write("               GPG Key: " + ("default" if args.key is None else args.key) + "\n")
+        sys.stderr.write("              Password: " + ("default" if args.password is None else args.password) + "\n")
 
 def build_image(args, workspace, run_build_script):
     # If there's no build script set, there's no point in executing