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

Back-port #33700 to 2015.8 #33718

Merged
merged 2 commits into from
Jun 3, 2016
Merged

Back-port #33700 to 2015.8 #33718

merged 2 commits into from
Jun 3, 2016

Conversation

rallytime
Copy link
Contributor

Back-port #33700 to 2015.8

On Gentoo, we should check the value passed in to timezone.set_hwclock
and only allow 'UTC' or 'localtime' for argument. If incorrect value is
passed in, it could subsequently fry the important config file.

There is another closely related issue on Gentoo. The value to set
'clock' variable in the config file is either 'UTC' or 'local'. In case
of localtime arg, we should convert the value of 'localtime' to 'local'
when setting that 'clock' variable.
Erik Johnson pointed out the speed issue with compelling numbers:

>>> import timeit
>>> t1 = timeit.Timer('clock == "localtime"', 'clock = "localtime"')
>>> t2 = timeit.Timer('clock.__eq__("localtime")', 'clock = "localtime"')
>>> t1.repeat()
[0.061421871185302734, 0.0285952091217041, 0.026736021041870117]
>>> t2.repeat()
[0.1310901641845703, 0.09536910057067871, 0.09479284286499023]

I'll absolutely fix it by using the simple '==' operator.

Thank you!
@cachedout cachedout merged commit 2c450a7 into saltstack:2015.8 Jun 3, 2016
@rallytime rallytime deleted the bp-33700 branch June 3, 2016 20:31
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.

3 participants