提交 9e1b8641 编写于 作者: N nicolargo

Merge commit '31ed2dba'

### Resume
| Q | A
| ------------- | ---
| Bug? | yes/no
| New feature? | yes/no
### Description
### Versions
<!-- You can use `glances -V` to retrieve Glances and PSutil versions -->
* Glances:
* PSutil:
* OS:
### Resume
| Q | A
| ------------- | ---
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
| Deprecations? | yes/no
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
### Description
......@@ -2,6 +2,13 @@
Glances Version 2
==============================================================================
Version 2.7
===========
Bugs corrected:
* Crash on launch when viewing temperature of laptop HDD in sleep mode (issue #824)
Version 2.6.1
=============
......
......@@ -27,7 +27,7 @@ import sys
# Global name
__appname__ = 'glances'
__version__ = '2.6.1'
__version__ = '2.7_BETA'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'
......
......@@ -21,6 +21,7 @@
import os
import socket
import numbers
from glances.compat import nativestr, range
from glances.logger import logger
......@@ -119,7 +120,8 @@ class GlancesGrabHDDTemp(object):
temperature = fields[offset + 3]
unit = nativestr(fields[offset + 4])
hddtemp_current['label'] = device
hddtemp_current['value'] = float(temperature) if temperature != b'ERR' else temperature
# Temperature could be 'ERR' or 'SLP' (see issue#824)
hddtemp_current['value'] = float(temperature) if isinstance(temperature, numbers.Number) else temperature
hddtemp_current['unit'] = unit
self.hddtemp_list.append(hddtemp_current)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册