Skip to content

Commit 7617b40

Browse files
committed
Fix mixed cname with separate version argument parsing
Signed-off-by: Tobias Wolf <[email protected]>
1 parent acd4782 commit 7617b40

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

src/gardenlinux/features/__main__.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ def main() -> None:
7474
if args.arch is not None:
7575
arch = args.arch
7676

77+
if gardenlinux_root == "":
78+
gardenlinux_root = "."
79+
7780
if args.version is not None:
7881
version = args.version
7982

@@ -106,12 +109,6 @@ def main() -> None:
106109

107110
feature_dir_name = path.basename(args.feature_dir)
108111

109-
if gardenlinux_root == "":
110-
gardenlinux_root = "."
111-
112-
if gardenlinux_root == "":
113-
gardenlinux_root = "."
114-
115112
additional_filter_func = lambda node: node not in args.ignore
116113

117114
if args.type == "arch":

src/gardenlinux/features/cname_main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ def main():
5151
if args.arch is not None:
5252
arch = args.arch
5353

54-
if args.version is not None:
55-
version = args.version
54+
if gardenlinux_root == "":
55+
gardenlinux_root = "."
5656

5757
if not version:
5858
version_data = get_version_and_commit_id_from_files(gardenlinux_root)

0 commit comments

Comments
 (0)