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

Add handling for FreeBSD in timezone.zone_compare #44605

Merged
merged 3 commits into from
Nov 20, 2017
Merged

Add handling for FreeBSD in timezone.zone_compare #44605

merged 3 commits into from
Nov 20, 2017

Conversation

campbellmc
Copy link
Contributor

What does this PR do?

Adds code to call out specific case when /etc/localtime is absent on FreeBSD in the zone_compare method. PR means zone_compare will not cause exception when FreeBSD is set to UTC by absent /etc/localtime link or file.

What issues does this PR fix or reference?

timezone.system fails when /etc/localtime is missing on FreeBSD #44083
#44083

Previous Behavior

method caused exception if /etc/localtime was missing on FreeBSD

New Behavior

For FreeBSD - if /etc/localtime is absent, zone_compare will use the timezone reported by the OS to determine if set_zone needs to be executed.

Tests written?

No

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

campbellmc and others added 2 commits November 20, 2017 16:50
…en /etc/localtime file does is absent. This is valid configuration on FreeBSD and represents UTC.
@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Nov 20, 2017
@rallytime rallytime merged commit 3c24edd into saltstack:develop Nov 20, 2017
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Nov 28, 2017
thatch45 added a commit that referenced this pull request Dec 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants