Fix mixed cname with separate version argument parsing

Signed-off-by: Tobias Wolf <[email protected]>

Author: NotTheEvilOne

src/gardenlinux/features/__main__.py

@@ -74,6 +74,9 @@ def main() -> None:
     if args.arch is not None:
         arch = args.arch
 
+    if gardenlinux_root == "":
+        gardenlinux_root = "."
+
     if args.version is not None:
         version = args.version
 
@@ -106,12 +109,6 @@ def main() -> None:
 
     feature_dir_name = path.basename(args.feature_dir)
 
-    if gardenlinux_root == "":
-        gardenlinux_root = "."
-
-    if gardenlinux_root == "":
-        gardenlinux_root = "."
-
     additional_filter_func = lambda node: node not in args.ignore
 
     if args.type == "arch":

src/gardenlinux/features/cname_main.py

@@ -51,8 +51,8 @@ def main():
     if args.arch is not None:
         arch = args.arch
 
-    if args.version is not None:
-        version = args.version
+    if gardenlinux_root == "":
+        gardenlinux_root = "."
 
     if not version:
         version_data = get_version_and_commit_id_from_files(gardenlinux_root)
@@ -75,9 +75,11 @@ def main():
     sorted_minimal_features = sort_subset(minimal_feature_set, sorted_features)
 
     generated_cname = get_cname_base(sorted_minimal_features)
+    print(generated_cname)
 
     if cname.arch is not None:
         generated_cname += f"-{cname.arch}"
+    print(generated_cname)
 
     if cname.version_and_commit_id is not None:
         generated_cname += f"-{cname.version_and_commit_id}"