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

Fix psutil.cpu_times unpack error #32182

Merged
merged 1 commit into from
Mar 28, 2016
Merged

Fix psutil.cpu_times unpack error #32182

merged 1 commit into from
Mar 28, 2016

Conversation

dongweiming
Copy link
Contributor

What does this PR do?

I got a error when use sudo salt '*' ps.top:

130:
    The minion function caused an exception: Traceback (most recent call last):
      File "/usr/lib/python2.7/dist-packages/salt/minion.py", line 1071, in _thread_return
        return_data = func(*args, **kwargs)
      File "/usr/lib/python2.7/dist-packages/salt/modules/ps.py", line 136, in top
        user, system = process.cpu_times()
    ValueError: too many values to unpack

We need compatible with the new method.

What issues does this PR fix or reference?

giampaolo/psutil#785 Now cpu_times return four values

New Behavior

Now ps.top works.

Tests written?

No

@cachedout cachedout merged commit c983974 into saltstack:develop Mar 28, 2016
@cachedout
Copy link
Contributor

Nice! Thanks, @dongweiming

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Jun 24, 2016
@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 Jun 27, 2016
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.

None yet

3 participants