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.py

@@ -64,6 +64,7 @@ def __init__(self, cname, arch=None, version=None):
             self._arch = arch
 
         if self._version is None and version is not None:
+            print("-r-")
             re_match = re.match("([a-z0-9.]+)(-([a-z0-9]+))?$", version)
             assert re_match, f"Not a valid version {version}"
 
@@ -159,4 +160,8 @@ def version_and_commit_id(self) -> Optional[str]:
         if self._commit_id is None:
             return None
 
+        print("---")
+        print(self._commit_id)
+        print(self._version)
+        print("---")
         return f"{self._version}-{self._commit_id}"

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)