diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..ec918081 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,17 @@ +### Resume + +| Q | A +| ------------- | --- +| Bug? | yes/no +| New feature? | yes/no + +### Description + + +### Versions + + + +* Glances: +* PSutil: +* OS: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..d92f909d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,11 @@ +### 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 diff --git a/NEWS b/NEWS index b7942d45..ddefe38d 100644 --- a/NEWS +++ b/NEWS @@ -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 ============= diff --git a/glances/__init__.py b/glances/__init__.py index e381f305..ebcb1bba 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -27,7 +27,7 @@ import sys # Global name __appname__ = 'glances' -__version__ = '2.6.1' +__version__ = '2.7_BETA' __author__ = 'Nicolas Hennion ' __license__ = 'LGPL' diff --git a/glances/plugins/glances_hddtemp.py b/glances/plugins/glances_hddtemp.py index 8a1347c4..9c117497 100644 --- a/glances/plugins/glances_hddtemp.py +++ b/glances/plugins/glances_hddtemp.py @@ -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)