Skip to content

libntech bump and WriterWriteHelp()/ManPageWrite() backports#4190

Merged
olehermanse merged 4 commits intocfengine:3.15.xfrom
olehermanse:3.15.x_libntech
May 20, 2020
Merged

libntech bump and WriterWriteHelp()/ManPageWrite() backports#4190
olehermanse merged 4 commits intocfengine:3.15.xfrom
olehermanse:3.15.x_libntech

Conversation

@olehermanse
Copy link
Copy Markdown
Member

@olehermanse olehermanse commented May 19, 2020 •
edited
Loading

@olehermanse
libntech: Bumped to master
8ed9d08 
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
@olehermanse olehermanse changed the title libntech: Bumped to master libntech: Bumped to master (3.15) May 19, 2020
@olehermanse olehermanse added the WIP Work in Progress label May 19, 2020
olehermanse and others added 3 commits May 19, 2020 17:58
@olehermanse
configure.ac: Removed libntech automake files
d422ec7 
It should not list them, they are listed in
libntech/configure.ac and have different AM_CONDITIONAL's

Also updated libntech to latest master, which needs this.

Changelog: None
Ticket: None
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
(cherry picked from commit a9266d3)
@vpodzime @olehermanse
Add COMMANDS section to the cf-net and cf-keycrypt man pages
aeb8bb1 
Quite important piece of information that should be there.

Conflicts: cf-keycrypt

Ticket: CFE-3272
Changelog: None
(cherry picked from commit c524680)
@vpodzime @olehermanse
Backported WriterWriteHelp changes to 3.15.x
a41c44a 
Conflicts: Lots, this was originally a commit about cf-keycrypt

Ticket: CFE-3272
Changelog: None
(cherry picked from commit 163ecc3)
@olehermanse
Copy link
Copy Markdown
Member Author

olehermanse commented May 19, 2020

@cf-bottom jenkins, please.

@olehermanse olehermanse removed the WIP Work in Progress label May 19, 2020
@cf-bottom
Copy link
Copy Markdown

cf-bottom commented May 19, 2020

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/5153/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-5153/

@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 19, 2020

This pull request introduces 1 alert when merging a41c44a into 01e870d - view on LGTM.com

new alerts:

  • 1 for Pointer argument is dereferenced without checking for NULL

@craigcomstock craigcomstock mentioned this pull request May 19, 2020
Closed
@craigcomstock
Copy link
Copy Markdown
Contributor

craigcomstock commented May 19, 2020

fr-tests failure is a bash error in FR_basic_setup.test, I will fix.

shellcheck shows the error:

/northern.tech/cfengine/system-testing/deployment_tests/new_tests$ shellcheck -x FR_tests/all_platforms/FR_basic_setup.test

In FR_tests/all_platforms/FR_basic_setup.test line 76:
if grep -P '(err|fail)' .$$.install.log >/dev/null; then
                                                    ^-- SC1009: The mentioned parser error was in this then clause.


In FR_tests/all_platforms/FR_basic_setup.test line 79:
  if grep -P 'scriptlet failed' .$$.install.log >/dev/null;
  ^-- SC1049: Did you forget the 'then' for this 'if'?
  ^-- SC1073: Couldn't parse this if expression.


In FR_tests/all_platforms/FR_basic_setup.test line 84:
  fi
  ^-- SC1050: Expected 'then'.
    ^-- SC1072: Unexpected keyword/token. Fix any mentioned problems and try again.

@craigcomstock
Copy link
Copy Markdown
Contributor

craigcomstock commented May 19, 2020

Retrying fr-tests with my fix.
Build Status

@olehermanse olehermanse changed the title libntech: Bumped to master (3.15) libntech bump and WriterWriteHelp()/ManPageWrite() backports May 20, 2020
vpodzime
vpodzime approved these changes May 20, 2020
View reviewed changes
Copy link
Copy Markdown
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.

ACK

@olehermanse olehermanse merged commit 7d992cb into cfengine:3.15.x May 20, 2020
@olehermanse olehermanse deleted the 3.15.x_libntech branch May 20, 2020 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vpodzime vpodzime vpodzime approved these changes

@craigcomstock craigcomstock craigcomstock approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@olehermanse @cf-bottom @craigcomstock @vpodzime