Skip to content

Commit 5010d3a

Browse files
committed
Fixed missing flags in generate-release-information
Ticket: ENT-13776 Signed-off-by: Victor Moene <victor.moene@northern.tech>
1 parent f27fab4 commit 5010d3a

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

src/cfengine_cli/dev.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ def lint_docs() -> int:
6464
return 1
6565

6666

67-
def generate_release_information() -> int:
67+
def generate_release_information(
68+
omit_download=False, check=False, min_version=None
69+
) -> int:
6870
answer = _expect_repo("release-information")
6971
if answer:
70-
generate_release_information_command()
72+
generate_release_information_command(omit_download, check, min_version)
7173
return 0
7274
return 1
7375

@@ -82,6 +84,8 @@ def dispatch_dev_subcommand(subcommand, args) -> int:
8284
if subcommand == "lint-docs":
8385
return lint_docs()
8486
if subcommand == "generate-release-information":
85-
return generate_release_information()
87+
return generate_release_information(
88+
args.omit_download, args.check_against_git, args.minimum_version
89+
)
8690

8791
raise UserError("Invalid cfengine dev subcommand - " + subcommand)

src/cfengine_cli/docs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from cfengine_cli.lint import lint_policy_file
1919
from cfengine_cli.utils import UserError
2020

21-
2221
IGNORED_DIRS = [".git"]
2322

2423

src/cfengine_cli/main.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,23 @@ def _get_arg_parser():
8787
)
8888
dev_subparsers.add_parser("format-docs")
8989
dev_subparsers.add_parser("lint-docs")
90-
dev_subparsers.add_parser("generate-release-information")
90+
parser = dev_subparsers.add_parser("generate-release-information")
91+
92+
parser.add_argument(
93+
"--omit-download",
94+
help="Use existing masterfiles instead of downloading in 'cfbs generate-release-information'",
95+
action="store_true",
96+
)
97+
parser.add_argument(
98+
"--check-against-git",
99+
help="Check whether masterfiles from cfengine.com and github.com match in 'cfbs generate-release-information'",
100+
action="store_true",
101+
)
102+
parser.add_argument(
103+
"--from",
104+
help="Specify minimum version in 'cfbs generate-release-information'",
105+
dest="minimum_version",
106+
)
91107

92108
return ap
93109

0 commit comments

Comments
 (0)