Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify all calls to WriterWriteHelp to adapt to API change #5339

Merged
merged 3 commits into from
Oct 11, 2023

Conversation

lluiscampos
Copy link
Contributor

@lluiscampos lluiscampos commented Oct 6, 2023

@lluiscampos
Copy link
Contributor Author

Copy link
Contributor

@vpodzime vpodzime left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me otherwise. It will need changes in other CFEngine repos, but I can take care of that. Thanks!

cf-agent/cf-agent.c Outdated Show resolved Hide resolved
@lluiscampos lluiscampos force-pushed the value-add-copyright-libntech branch from 5444a9e to 8ac665f Compare October 6, 2023 10:40
@lluiscampos lluiscampos requested a review from vpodzime October 6, 2023 10:44
dependabot bot and others added 3 commits October 6, 2023 14:12
Bumps [libntech](https://github.com/cfengine/libntech) from `49cd554` to `8545ebb`.
- [Commits](NorthernTechHQ/libntech@49cd554...8545ebb)

---
updated-dependencies:
- dependency-name: libntech
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@vpodzime
Copy link
Contributor

vpodzime commented Oct 6, 2023

@cf-bottom jenkins, please

@cf-bottom
Copy link

Copy link
Member

@olehermanse olehermanse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work, but looks like this needs at least a change in enterprise repo for windows to compile.

@vpodzime
Copy link
Contributor

vpodzime commented Oct 9, 2023

Great work, but looks like this needs at least a change in enterprise repo for windows to compile.

What do you mean @olehermanse? I see this:

ci/testing_pr/PACKAGES_i386_mingw — Build and tests finished: success
ci/testing_pr/PACKAGES_x86_64_mingw — Build and tests finished: success

@larsewi larsewi self-assigned this Oct 9, 2023
@larsewi
Copy link
Contributor

larsewi commented Oct 9, 2023

Windows packages don't seem to work. But I will take a look at it this week :)
Screenshot 2023-10-09 at 11 29 58

@larsewi
Copy link
Contributor

larsewi commented Oct 11, 2023

Tested, built together with https://github.com/cfengine/nova/pull/2130#issuecomment-1754585718. And it seems to work :)

@larsewi larsewi requested a review from olehermanse October 11, 2023 10:02
@larsewi
Copy link
Contributor

larsewi commented Oct 11, 2023

Merging can be performed automatically once the requested changes are addressed.

Not able to merge

@olehermanse olehermanse merged commit d3ce449 into cfengine:master Oct 11, 2023
12 of 13 checks passed
@lluiscampos lluiscampos deleted the value-add-copyright-libntech branch October 11, 2023 12:05
@craigcomstock
Copy link
Contributor

@lluiscampos @olehermanse did we really want to remove all the Commands: text from the help?

It used to be

$ /var/cfengine/bin/cf-check --help

cf-check:
        Utility for diagnosis and repair of local CFEngine databases.
        This BETA version of the tool is for testing purposes only.

Commands:
        dump - Print the contents of a database file
        diagnose - Assess the health of one or more database files
        backup - Copy database files to a timestamped folder
        repair - Diagnose, then backup and delete any corrupt databases
        version - Print version information
        help - Print this help menu

Usage:
        $ cf-check <command> [options] [file ...]

Examples:
        $ cf-check dump /var/cfengine/state/cf_lastseen.lmdb
        $ cf-check lmdump -a /var/cfengine/state/cf_lastseen.lmdb
        $ cf-check diagnose
        $ cf-check repair

But now is

$ cf-check --help
Usage: cf-check [OPTIONS] [FILE]

Options:
  --help        , -h value - Print the help message
  --manpage     , -M       - Print the man page
  --version     , -V       - Output the version of the software
  --debug       , -d       - Enable debugging output
  --verbose     , -v       - Enable verbose output
  --log-level   , -g value - Specify how detailed logs should be. Possible values: 'error', 'warning', 'notice', 'info', 'verbose', 'debug'
  --inform      , -I       - Enable basic information output

Website: https://cfengine.com
This software is Copyright 2023 Northern.tech AS.

Not quite as informative as it should be I think.

@lluiscampos
Copy link
Contributor Author

@lluiscampos @olehermanse did we really want to remove all the Commands: text from the help?

Thanks for reporting.

The commands were indeed removed by mistake. See the follow-up in #5353. See discussion there for what happened to the examples.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

6 participants