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

HOTFIX: Deprecated time format verify logic fix #838

Merged
merged 1 commit into from
Aug 25, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Aug 25, 2020

Describe the contribution
HOTFIX - Changes the time format compile time verification logic. Old logic would report error if none of the defines exist, new logic only reports error if the time format is not the default (also works if neither are defined).

Testing performed
Built with time format set to default, time format defines not defined, and time format set to non-default. Responded as expected.

Expected behavior changes
No longer reports error if defines are removed (as is the case in the sample config)

System(s) tested on

  • Hardware: cFS Dev Server
  • OS: Ubuntu 18.04
  • Versions: integration candidate bundle + this change

Additional context
Fix to PR #801

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@astrogeco astrogeco merged commit e4f7c26 into nasa:integration-candidate Aug 25, 2020
yammajamma added a commit to nasa/cFS that referenced this pull request Aug 25, 2020
astrogeco pushed a commit to nasa/cFS that referenced this pull request Aug 25, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 25, 2020
Contains: 

nasa/cFE#833
nasa/osal#576
nasa/to_lab#58
nasa/sch_lab#52

1. Update submodules for IC-20200819

2. Update cfe to reflect HOTFIX nasa/cFE#838

3. Point submodules to main for IC-20200819

Co-authored-by: Yasir Khan <yasir.majeed@nasa.gov>
@skliper skliper deleted the integration-candidate branch February 1, 2021 22:05
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants